diff --git a/examples/blueprint_plugins/plugins/fancy_type.html b/examples/blueprint_plugins/plugins/fancy_type.html index c3e55462..228c0da8 100644 --- a/examples/blueprint_plugins/plugins/fancy_type.html +++ b/examples/blueprint_plugins/plugins/fancy_type.html @@ -38,7 +38,7 @@
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc congue ipsum vestibulum libero. Aenean vitae justo. Nam eget tellus. Etiam convallis, est eu lobortis mattis, lectus tellus tempus felis, a ultricies erat ipsum at metus.
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc congue ipsum vestibulum libero. Aenean vitae justo. Nam eget tellus. Etiam convallis, est eu lobortis mattis, lectus tellus tempus felis, a ultricies erat ipsum at metus.
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi et risus. Aliquam nisl. Nulla facilisi. Cras accumsan vestibulum ante. Vestibulum sed tortor. Praesent SMALL CAPS tempus fringilla elit. Ut elit diam, sagittis in, nonummy in, gravida non, nunc. Ut orci. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Nam egestas, orci eu imperdiet malesuada, nisl purus fringilla odio, quis commodo est orci vitae justo. Aliquam placerat odio tincidunt nulla. Cras in libero. Aenean rutrum, magna non tristique posuere, erat odio eleifend nisl, non convallis est tortor blandit ligula. Nulla id augue.
Nullam mattis, odio ut tempus facilisis, metus nisl facilisis metus, auctor consectetuer felis ligula nec mauris. Vestibulum odio erat, fermentum at, commodo vitae, ultrices et, urna. Mauris vulputate, mi pulvinar sagittis condimentum, sem nulla aliquam velit, sed imperdiet mi purus eu magna. Nulla varius metus ut eros. Aenean aliquet magna eget orci. Class aptent taciti sociosqu ad litora.
Vivamus euismod. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Suspendisse vel nibh ut turpis dictum sagittis. Aliquam vel velit a elit auctor sollicitudin. Nam vel dui vel neque lacinia pretium. Quisque nunc erat, venenatis id, volutpat ut, scelerisque sed, diam. Mauris ante. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Donec mattis. Morbi dignissim sollicitudin libero. Nulla lorem.
diff --git a/examples/blueprint_plugins/plugins/rtl.html b/examples/blueprint_plugins/plugins/rtl.html index 64f5006c..b4deb659 100644 --- a/examples/blueprint_plugins/plugins/rtl.html +++ b/examples/blueprint_plugins/plugins/rtl.html @@ -38,7 +38,7 @@Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc congue ipsum vestibulum libero. Aenean vitae justo. Nam eget tellus. Etiam convallis, est eu lobortis mattis, lectus tellus tempus felis, a ultricies erat ipsum at metus.
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Nunc congue ipsum vestibulum libero. Aenean vitae justo. Nam eget tellus. Etiam convallis, est eu lobortis mattis, lectus tellus tempus felis, a ultricies erat ipsum at metus.
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Morbi et risus. Aliquam nisl. Nulla facilisi. Cras accumsan vestibulum ante. Vestibulum sed tortor. Praesent SMALL CAPS tempus fringilla elit. Ut elit diam, sagittis in, nonummy in, gravida non, nunc. Ut orci. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Nam egestas, orci eu imperdiet malesuada, nisl purus fringilla odio, quis commodo est orci vitae justo. Aliquam placerat odio tincidunt nulla. Cras in libero. Aenean rutrum, magna non tristique posuere, erat odio eleifend nisl, non convallis est tortor blandit ligula. Nulla id augue.
Nullam mattis, odio ut tempus facilisis, metus nisl facilisis metus, auctor consectetuer felis ligula nec mauris. Vestibulum odio erat, fermentum at, commodo vitae, ultrices et, urna. Mauris vulputate, mi pulvinar sagittis condimentum, sem nulla aliquam velit, sed imperdiet mi purus eu magna. Nulla varius metus ut eros. Aenean aliquet magna eget orci. Class aptent taciti sociosqu ad litora.
Vivamus euismod. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Suspendisse vel nibh ut turpis dictum sagittis. Aliquam vel velit a elit auctor sollicitudin. Nam vel dui vel neque lacinia pretium. Quisque nunc erat, venenatis id, volutpat ut, scelerisque sed, diam. Mauris ante. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas. Donec mattis. Morbi dignissim sollicitudin libero. Nulla lorem.
diff --git a/frameworks/blueprint/stylesheets/blueprint/_print.sass b/frameworks/blueprint/stylesheets/blueprint/_print.sass index 24211203..d147bf7a 100644 --- a/frameworks/blueprint/stylesheets/blueprint/_print.sass +++ b/frameworks/blueprint/stylesheets/blueprint/_print.sass @@ -25,7 +25,7 @@ // Feel free to mix it into anchors where you want it. =blueprint-show-link-urls &:after - :content " (" attr(href) ") " + :content " (" attr(href) ")" :font-size 90% =blueprint-print-body diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass index 9cb07caf..278951f7 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_colors.sass @@ -28,3 +28,6 @@ !added_bg_color ||= #060 !removed_color ||= #FFF !removed_bg_color ||= #900 + +!blueprint_table_header_color ||= #C3D9FF +!blueprint_table_stripe_color ||= #E5ECF9 diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass index 5850da3f..28fc5717 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_rtl.sass @@ -122,9 +122,15 @@ pre, code, tt :font-family monospace - p img - :float right - :margin 1.5em 0 1.5em 1.5em + p + img.right + +float-left + :margin 1.5em 1.5em 1.5em 0 + :padding 0 + img.left + +float-right + :margin 1.5em 0 1.5em 1.5em + :padding 0 dd, ul, ol :margin-left 0 diff --git a/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass b/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass index f80284e7..ec36f2db 100644 --- a/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass +++ b/frameworks/blueprint/stylesheets/blueprint/modules/_typography.sass @@ -2,7 +2,7 @@ @import compass/utilities/links/link_colors.sass @import compass/utilities/general/float.sass -!blueprint_font_family ||= "Helvetica Neue, Helvetica, Arial, sans-serif" +!blueprint_font_family ||= "Helvetica Neue, Arial, Helvetica, sans-serif" !blueprint_fixed_font_family ||= "'andale mono', 'lucida console', monospace" // The +blueprint-typography mixin must be mixed into the top level of your stylesheet. @@ -70,7 +70,6 @@ :font-size 1.2em :line-height 1.25 :margin-bottom 1.25em - :height 1.25em h5 +header-text :font-size 1em @@ -84,13 +83,14 @@ :margin 0 p :margin 0 0 1.5em - img + img.left +float-left :margin 1.5em 1.5em 1.5em 0 :padding 0 - &.right - +float-right - :margin 1.5em 0 1.5em 1.5em + img.right + +float-right + :margin 1.5em 0 1.5em 1.5em + :padding 0 a :text-decoration underline +link-colors(!link_color, !link_hover_color, !link_active_color, !link_visited_color, !link_focus_color) @@ -114,11 +114,10 @@ :font-style italic del :color #666 - pre, code + pre :margin 1.5em 0 :white-space pre - +fixed-width-text - tt + pre, code, tt +fixed-width-text li ul, li ol :margin 0 1.5em @@ -139,12 +138,12 @@ :width 100% th :font-weight bold - :background #C3D9FF - :padding 4px 10px 4px 5px - td + thead th + :background= !blueprint_table_header_color + th, td, caption :padding 4px 10px 4px 5px tr.even td - :background #E5ECF9 + :background= !blueprint_table_stripe_color tfoot :font-style italic caption