changeset 7:ae90226109ff

Prefix conflicting BS3 classes with bs3_.
author Patrick Hurst <phurst@mit.edu>
date Sat, 01 Mar 2014 03:05:18 -0500
parents 93ebf657faf7
children f7fb99a9f2e4
files bootstrap3.ur bootstrap3.urp
diffstat 2 files changed, 22 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/bootstrap3.ur	Sat Mar 01 02:56:17 2014 -0500
+++ b/bootstrap3.ur	Sat Mar 01 03:05:18 2014 -0500
@@ -1,6 +1,6 @@
 style active
 style affix
-style alert
+style bs3_alert
 style alert_danger
 style alert_dismissable
 style alert_info
@@ -391,8 +391,8 @@
 style glyphicon_th
 style glyphicon_th_large
 style glyphicon_th_list
-style glyphicon_thumbs_down
-style glyphicon_thumbs_up
+style glyphicon_thumbs3_down
+style glyphicon_thumbs3_up
 style glyphicon_time
 style glyphicon_tint
 style glyphicon_tower
@@ -411,12 +411,12 @@
 style glyphicon_wrench
 style glyphicon_zoom_in
 style glyphicon_zoom_out
-style h1
-style h2
-style h3
-style h4
-style h5
-style h6
+style bs3_h1
+style bs3_h2
+style bs3_h3
+style bs3_h4
+style bs3_h5
+style bs3_h6
 style has_error
 style has_success
 style has_warning
@@ -476,7 +476,7 @@
 style nav_pills
 style nav_stacked
 style nav_tabs
-style nav_tabs_justified
+style nav_tabs3_justified
 style navbar
 style navbar_brand
 style navbar_btn
@@ -525,10 +525,10 @@
 style progress_striped
 style pull_left
 style pull_right
-style radio
+style bs3_radio
 style radio_inline
 style row
-style show
+style bs3_show
 style sr_only
 style tab_content
 style tabbable
--- a/bootstrap3.urp	Sat Mar 01 02:56:17 2014 -0500
+++ b/bootstrap3.urp	Sat Mar 01 03:05:18 2014 -0500
@@ -1,3 +1,12 @@
-rewrite style Bootstrap3/* [-]
+rewrite style Bootstrap3/bs3_alert alert
+rewrite style Bootstrap3/bs3_h1 h1
+rewrite style Bootstrap3/bs3_h2 h2
+rewrite style Bootstrap3/bs3_h3 h3
+rewrite style Bootstrap3/bs3_h4 h4
+rewrite style Bootstrap3/bs3_h5 h5
+rewrite style Bootstrap3/bs3_h6 h6
+rewrite style Bootstrap3/bs3_radio radio
+rewrite style Bootstrap3/bs3_show show
+rewrite style Bootstrap3/*[-]
 
 bootstrap3
\ No newline at end of file