| OLD | NEW |
| 1 @import url(https://fonts.googleapis.com/css?family=Open+Sans:400,700|Montserrat
:400,700); | 1 @import url(https://fonts.googleapis.com/css?family=Roboto:300,400|Montserrat:40
0,700); |
| 2 | 2 |
| 3 @import "compass/reset"; | 3 @import "compass/reset"; |
| 4 @import "compass/typography/text/replacement"; | 4 @import "compass/typography/text/replacement"; |
| 5 | 5 |
| 6 @import "syntax"; | 6 @import "partials/variables"; |
| 7 @import "partials/syntax"; |
| 7 | 8 |
| 8 $baseFontSize: 14px; | 9 @import "bootstrap/theme"; |
| 9 $baseLineHeight: 24px; | 10 @import "bootstrap"; |
| 10 | |
| 11 $sansFontFamily: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; | |
| 12 | |
| 13 $iconSpritePath: 'img/glyphicons-halflings.png'; | |
| 14 $iconWhiteSpritePath: 'img/glyphicons-halflings-white.png'; | |
| 15 | |
| 16 @import "compass_twitter_bootstrap"; | |
| 17 | 11 |
| 18 // Don't require nasty <table class="table"> that bootstrap expects. | 12 // Don't require nasty <table class="table"> that bootstrap expects. |
| 19 table { | 13 table { |
| 20 @extend .table; | 14 @extend .table; |
| 21 } | 15 } |
| 22 | 16 |
| 17 // TODO(amouravski): chuck these when everything else has been updated. |
| 18 //$sansFontFamily: "Open Sans", "Helvetica Neue", Helvetica, Arial, sans-serif; |
| 19 // |
| 20 //$iconWhiteSpritePath: 'img/glyphicons-halflings-white.png'; |
| 21 |
| 22 // Navbar |
| 23 // ------------------------- |
| 24 |
| 25 $navbar-font-family: "Montserrat", sans-serif; |
| 26 |
| 27 .navbar { |
| 28 border: none; |
| 29 $shadow: 0 2px 2px rgba(50, 50, 50, 0.15); |
| 30 @include box-shadow($shadow); |
| 31 } |
| 32 |
| 33 .navbar-brand { |
| 34 font-family: $navbar-font-family; |
| 35 } |
| 36 |
| 37 .navbar-nav > li > a { |
| 38 padding-top: 25px; |
| 39 font-family: $navbar-font-family; |
| 40 font-size: $font-size-small; |
| 41 text-transform: uppercase; |
| 42 } |
| 43 |
| 44 // Body |
| 45 // ------------------------- |
| 46 |
| 23 body { | 47 body { |
| 24 // Account for the fixed navbar height. | 48 // Account for the fixed navbar height. |
| 25 padding-top: 60px; | 49 padding-top: 65px; |
| 50 |
| 51 -webkit-font-smoothing: antialiased; |
| 26 } | 52 } |
| 27 | |
| 28 // Don't word wrap inline code. | 53 // Don't word wrap inline code. |
| 29 code { | 54 code { |
| 30 white-space: nowrap; | 55 white-space: nowrap; |
| 31 } | 56 } |
| 32 | 57 |
| 33 pre code { | 58 pre code { |
| 34 white-space: inherit; | 59 white-space: inherit; |
| 35 } | 60 } |
| 36 | 61 |
| 37 pre b { | 62 pre b { |
| 38 font-weight: bold; | 63 font-weight: bold; |
| 39 } | 64 } |
| 40 | 65 |
| 41 a.permalink { | 66 a.permalink { |
| 42 margin-left: 0.5em; | 67 margin-left: 0.5em; |
| 43 display: none; | 68 display: none; |
| 44 } | 69 } |
| 45 | 70 |
| 46 article { | 71 article { |
| 47 @extend .span8; | 72 @extend .col-md-8; |
| 48 | 73 |
| 49 position: relative; | 74 position: relative; |
| 50 | 75 |
| 51 h2, h3, h4 { | 76 h2, h3, h4 { |
| 52 // Ensure that the headers don't get covered up by the navbar when the user | 77 // Ensure that the headers don't get covered up by the navbar when the user |
| 53 // clicks on the permalink. | 78 // clicks on the permalink. |
| 54 padding-top: 40px; | 79 padding-top: 40px; |
| 55 margin-top: -40px; | 80 margin-top: -40px; |
| 56 | 81 |
| 57 &:hover a.permalink { | 82 &:hover a.permalink { |
| 58 display: inline; | 83 display: inline; |
| 59 } | 84 } |
| 60 } | 85 } |
| 61 } | 86 } |
| 62 | 87 |
| 63 .navbar-search { | |
| 64 margin-top: 4px; | |
| 65 | |
| 66 .search-query { | |
| 67 border-radius: 4px; | |
| 68 -moz-border-radius: 4px; | |
| 69 -webkit-border-radius: 4px; | |
| 70 height: 20px; | |
| 71 line-height: inherit; | |
| 72 } | |
| 73 } | |
| 74 | |
| 75 .has-permalink:hover > a.permalink { | 88 .has-permalink:hover > a.permalink { |
| 76 display:inline; | 89 display:inline; |
| 77 } | 90 } |
| 78 | 91 |
| 79 // Don't make tab bars so huge. | |
| 80 .nav-tabs > li > a { | |
| 81 padding-top: 4px; | |
| 82 padding-bottom: 4px; | |
| 83 } | |
| 84 | |
| 85 .nav { | |
| 86 margin-bottom: 8px; | |
| 87 } | |
| 88 | |
| 89 .package-sidebar { | 92 .package-sidebar { |
| 90 padding-top: 50px; | 93 padding-top: 50px; |
| 91 } | 94 } |
| 92 | 95 |
| 93 tt { | |
| 94 font-family: $monoFontFamily; | |
| 95 padding: 0 3px; | |
| 96 } | |
| 97 | |
| 98 footer { | 96 footer { |
| 99 @extend .well; | 97 @extend .well; |
| 100 @extend .well-small; | 98 @extend .well-sm; |
| 101 font-size: 13px; | 99 font-size: 13px; |
| 102 text-align: center; | 100 text-align: center; |
| 103 | 101 |
| 104 .login, .logout { | 102 .login, .logout { |
| 105 display: inline-block; | 103 display: inline-block; |
| 106 float: right; | 104 float: right; |
| 107 // #f5f5f5 is the background-color of the footer, which isn't a variable | 105 // #f5f5f5 is the background-color of the footer, which isn't a variable |
| 108 // for some reason. | 106 // for some reason. |
| 109 color: scale-color(#f5f5f5, $lightness: -15%); | 107 color: scale-color(#f5f5f5, $lightness: -15%); |
| 110 } | 108 } |
| 111 } | 109 } |
| 112 | 110 |
| 113 form#private-key textarea { | 111 // TODO(amouravski): add this back in? |
| 114 width: 550px; | 112 //form#private-key textarea { |
| 115 height: 420px; | 113 // width: 550px; |
| 116 font-family: $monoFontFamily; | 114 // height: 420px; |
| 117 } | 115 // font-family: $monoFontFamily; |
| 118 | 116 //} |
| 119 // We have two brands: the dart logo and "pub.dartlang.org". This keeps them | |
| 120 // from being too spread out. | |
| 121 .brand + .brand { | |
| 122 padding-left: 10px; | |
| 123 } | |
| 124 | |
| 125 // Highlight the brand text on hover. This matches other navbar buttons and | |
| 126 // makes it clearer that the logo links to something different. | |
| 127 a.brand:hover { | |
| 128 color: white; | |
| 129 } | |
| 130 | 117 |
| 131 .dart-logo { | 118 .dart-logo { |
| 132 @include replace-text("/static/img/dart.png", 0, 0); | 119 @include replace-text-with-dimensions("dart.png", 0, 0); |
| 133 width: 21px; | |
| 134 } | 120 } |
| 135 | 121 |
| 136 .intro { | 122 .intro { |
| 137 @extend .well; | 123 @extend .well; |
| 138 } | 124 } |
| 139 | 125 |
| 140 .get-started { | 126 .get-started { |
| 141 @extend .btn; | 127 @extend .btn; |
| 142 @extend .btn-primary; | 128 @extend .btn-primary; |
| 143 } | 129 } |
| (...skipping 22 matching lines...) Expand all Loading... |
| 166 margin: 3px 0 0 2px; | 152 margin: 3px 0 0 2px; |
| 167 } | 153 } |
| 168 | 154 |
| 169 .author { | 155 .author { |
| 170 white-space: nowrap; | 156 white-space: nowrap; |
| 171 } | 157 } |
| 172 | 158 |
| 173 .learn-more { | 159 .learn-more { |
| 174 a { | 160 a { |
| 175 @extend .btn; | 161 @extend .btn; |
| 176 @extend .btn-small; | 162 @extend .btn-sm; |
| 177 | 163 |
| 178 color: $linkColor; | 164 color: $link-color; |
| 179 | 165 |
| 180 float: right; | 166 float: right; |
| 181 position: absolute; | 167 position: absolute; |
| 182 width: 270px; | 168 width: 270px; |
| 183 right: -320px; | 169 right: -320px; |
| 184 | 170 |
| 185 display: inline-block; | 171 display: inline-block; |
| 186 } | 172 } |
| 187 } | 173 } |
| 188 | 174 |
| (...skipping 13 matching lines...) Expand all Loading... |
| 202 font-size: 13px; | 188 font-size: 13px; |
| 203 line-height: 21px; | 189 line-height: 21px; |
| 204 } | 190 } |
| 205 } | 191 } |
| 206 | 192 |
| 207 .toc:before { | 193 .toc:before { |
| 208 @extend h3; | 194 @extend h3; |
| 209 content: "Contents"; | 195 content: "Contents"; |
| 210 } | 196 } |
| 211 | 197 |
| 212 .pagination { | |
| 213 @extend .pagination-centered; | |
| 214 } | |
| 215 | |
| 216 .progress { | 198 .progress { |
| 217 @extend .progress-striped; | 199 @extend .progress-striped; |
| 218 } | 200 } |
| 219 | 201 |
| 220 [class^="icon-"], [class*=" icon-"] { | 202 [class^="icon-"], [class*=" icon-"] { |
| 221 @include hide-text; | 203 @include hide-text; |
| 222 } | 204 } |
| 223 | 205 |
| 224 ul ul { | 206 ul ul { |
| 225 list-style-type: circle; | 207 list-style-type: circle; |
| 226 } | 208 } |
| 227 | 209 |
| 228 .admin { | 210 // TODO(amouravski): Fix admin page. |
| 229 @extend .tabbable, .tabs-left; | 211 //.admin { |
| 230 | 212 // @extend .tabbable, .tabs-left; |
| 231 > ul { | 213 // |
| 232 @extend .nav, .nav-tabs; | 214 // > ul { |
| 233 } | 215 // @extend .nav, .nav-tabs; |
| 234 | 216 // } |
| 235 > div { | 217 // |
| 236 @extend .tab-content; | 218 // > div { |
| 237 | 219 // @extend .tab-content; |
| 238 > div { | 220 // |
| 239 @extend .tab-pane, .container-fluid; | 221 // > div { |
| 240 } | 222 // @extend .tab-pane, .container; |
| 241 } | 223 // } |
| 242 | 224 // } |
| 243 form button { | 225 // |
| 244 @extend .btn; | 226 // form button { |
| 245 } | 227 // @extend .btn; |
| 246 } | 228 // } |
| 229 //} |
| OLD | NEW |