diff options
Diffstat (limited to 'journal')
| -rw-r--r-- | journal/bootstrap.css | 80 | ||||
| -rw-r--r-- | journal/bootstrap.min.css | 26 | ||||
| -rwxr-xr-x | journal/index.html | 20 | ||||
| -rwxr-xr-x | journal/variables.less | 2 |
4 files changed, 74 insertions, 54 deletions
diff --git a/journal/bootstrap.css b/journal/bootstrap.css index 1e1ae274..fa682ccc 100644 --- a/journal/bootstrap.css +++ b/journal/bootstrap.css @@ -2442,15 +2442,15 @@ button.btn.small, input[type="submit"].btn.small { .navbar-inner { padding-left: 20px; padding-right: 20px; - background-color: #fafafc; - background-image: -moz-linear-gradient(top, #fafafc, #fafafc); - background-image: -ms-linear-gradient(top, #fafafc, #fafafc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafc), to(#fafafc)); - background-image: -webkit-linear-gradient(top, #fafafc, #fafafc); - background-image: -o-linear-gradient(top, #fafafc, #fafafc); - background-image: linear-gradient(top, #fafafc, #fafafc); + background-color: #fcfbfd; + background-image: -moz-linear-gradient(top, #fcfbfd, #fcfbfd); + background-image: -ms-linear-gradient(top, #fcfbfd, #fcfbfd); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fcfbfd), to(#fcfbfd)); + background-image: -webkit-linear-gradient(top, #fcfbfd, #fcfbfd); + background-image: -o-linear-gradient(top, #fcfbfd, #fcfbfd); + background-image: linear-gradient(top, #fcfbfd, #fcfbfd); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafc', endColorstr='#fafafc', GradientType=0); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfbfd', endColorstr='#fcfbfd', GradientType=0); -webkit-border-radius: 4px; -moz-border-radius: 4px; border-radius: 4px; @@ -2464,16 +2464,16 @@ button.btn.small, input[type="submit"].btn.small { padding: 7px 10px; margin-left: 5px; margin-right: 5px; - background-color: #fafafc; - background-image: -moz-linear-gradient(top, #fafafc, #fafafc); - background-image: -ms-linear-gradient(top, #fafafc, #fafafc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fafafc), to(#fafafc)); - background-image: -webkit-linear-gradient(top, #fafafc, #fafafc); - background-image: -o-linear-gradient(top, #fafafc, #fafafc); - background-image: linear-gradient(top, #fafafc, #fafafc); + background-color: #fcfbfd; + background-image: -moz-linear-gradient(top, #fcfbfd, #fcfbfd); + background-image: -ms-linear-gradient(top, #fcfbfd, #fcfbfd); + background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fcfbfd), to(#fcfbfd)); + background-image: -webkit-linear-gradient(top, #fcfbfd, #fcfbfd); + background-image: -o-linear-gradient(top, #fcfbfd, #fcfbfd); + background-image: linear-gradient(top, #fcfbfd, #fcfbfd); background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafc', endColorstr='#fafafc', GradientType=0); - border-color: #fafafc #fafafc #cacadf; + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfbfd', endColorstr='#fcfbfd', GradientType=0); + border-color: #fcfbfd #fcfbfd #d6c8e4; border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25); filter: progid:DXImageTransform.Microsoft.gradient(enabled = false); -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.075); @@ -2485,10 +2485,10 @@ button.btn.small, input[type="submit"].btn.small { .btn-navbar.active, .btn-navbar.disabled, .btn-navbar[disabled] { - background-color: #fafafc; + background-color: #fcfbfd; } .btn-navbar:active, .btn-navbar.active { - background-color: #dadae9 \9; + background-color: #e3d9ec \9; } .btn-navbar .icon-bar { display: block; @@ -2657,15 +2657,15 @@ button.btn.small, input[type="submit"].btn.small { .navbar .nav .active > a, .navbar .nav .active > a:hover { color: #222222; text-decoration: none; - background-color: #fafafc; + background-color: #fcfbfd; } .navbar .divider-vertical { height: 40px; width: 1px; margin: 0 9px; overflow: hidden; - background-color: #fafafc; - border-right: 1px solid #fafafc; + background-color: #fcfbfd; + border-right: 1px solid #fcfbfd; } .navbar .nav.pull-right { margin-left: 10px; @@ -3480,8 +3480,23 @@ a.thumbnail:hover { font-weight: 200; line-height: 27px; } +.pull-right { + float: right; +} +.pull-left { + float: left; +} +.hide { + display: none; +} +.show { + display: block; +} +.invisible { + visibility: hidden; +} body { - background-color: #fafafc !important; + background-color: #fcfbfd !important; } a { text-decoration: underline; @@ -3569,7 +3584,7 @@ form.navbar-form, form.navbar-search { color: #888888; } .dropdown-menu { - background-color: #fafafc; + background-color: #fcfbfd; } .dropdown-menu a { color: #222222; @@ -3579,7 +3594,7 @@ form.navbar-form, form.navbar-search { color: #222222; } div.subnav { - background-color: #fafafc; + background-color: #fcfbfd; background-image: none; -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25); -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25); @@ -3626,18 +3641,3 @@ pre.prettyprint, .table-striped tbody tr:nth-child(odd) th { background-color: #eeeeee; } -.pull-right { - float: right; -} -.pull-left { - float: left; -} -.hide { - display: none; -} -.show { - display: block; -} -.invisible { - visibility: hidden; -} diff --git a/journal/bootstrap.min.css b/journal/bootstrap.min.css index f3fcd992..2e8bcdea 100644 --- a/journal/bootstrap.min.css +++ b/journal/bootstrap.min.css @@ -479,9 +479,9 @@ button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom .tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;} .tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;} .navbar{overflow:visible;margin-bottom:18px;} -.navbar-inner{padding-left:20px;padding-right:20px;background-color:#fafafc;background-image:-moz-linear-gradient(top, #fafafc, #fafafc);background-image:-ms-linear-gradient(top, #fafafc, #fafafc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fafafc), to(#fafafc));background-image:-webkit-linear-gradient(top, #fafafc, #fafafc);background-image:-o-linear-gradient(top, #fafafc, #fafafc);background-image:linear-gradient(top, #fafafc, #fafafc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafc', endColorstr='#fafafc', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} -.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#fafafc;background-image:-moz-linear-gradient(top, #fafafc, #fafafc);background-image:-ms-linear-gradient(top, #fafafc, #fafafc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fafafc), to(#fafafc));background-image:-webkit-linear-gradient(top, #fafafc, #fafafc);background-image:-o-linear-gradient(top, #fafafc, #fafafc);background-image:linear-gradient(top, #fafafc, #fafafc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fafafc', endColorstr='#fafafc', GradientType=0);border-color:#fafafc #fafafc #cacadf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#fafafc;} -.btn-navbar:active,.btn-navbar.active{background-color:#dadae9 \9;} +.navbar-inner{padding-left:20px;padding-right:20px;background-color:#fcfbfd;background-image:-moz-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-ms-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fcfbfd), to(#fcfbfd));background-image:-webkit-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-o-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:linear-gradient(top, #fcfbfd, #fcfbfd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfbfd', endColorstr='#fcfbfd', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);} +.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#fcfbfd;background-image:-moz-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-ms-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fcfbfd), to(#fcfbfd));background-image:-webkit-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:-o-linear-gradient(top, #fcfbfd, #fcfbfd);background-image:linear-gradient(top, #fcfbfd, #fcfbfd);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fcfbfd', endColorstr='#fcfbfd', GradientType=0);border-color:#fcfbfd #fcfbfd #d6c8e4;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#fcfbfd;} +.btn-navbar:active,.btn-navbar.active{background-color:#e3d9ec \9;} .btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);} .btn-navbar .icon-bar+.icon-bar{margin-top:3px;} .nav-collapse.collapse{height:auto;} @@ -507,8 +507,8 @@ button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom .navbar .nav>li{display:block;float:left;} .navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#222222;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);} .navbar .nav>li>a:hover{background-color:transparent;color:#222222;text-decoration:none;} -.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#222222;text-decoration:none;background-color:#fafafc;} -.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#fafafc;border-right:1px solid #fafafc;} +.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#222222;text-decoration:none;background-color:#fcfbfd;} +.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#fcfbfd;border-right:1px solid #fcfbfd;} .navbar .nav.pull-right{margin-left:10px;margin-right:0;} .navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;} .navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;} @@ -626,7 +626,12 @@ a.thumbnail:hover{border-color:#222222;-webkit-box-shadow:0 1px 4px rgba(0, 105, .carousel-caption h4,.carousel-caption p{color:#ffffff;} .hero-unit{padding:60px;margin-bottom:30px;background-color:#f5f5f5;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;letter-spacing:-1px;} .hero-unit p{font-size:18px;font-weight:200;line-height:27px;} -body{background-color:#fafafc !important;} +.pull-right{float:right;} +.pull-left{float:left;} +.hide{display:none;} +.show{display:block;} +.invisible{visibility:hidden;} +body{background-color:#fcfbfd !important;} a{text-decoration:underline;} .nav a,.navbar .brand,.subnav a,a.btn{text-decoration:none;} h1,h2,h3,h4,h5,h6,.brand,.navbar,.subnav a,blockquote>p{font-family:'Open Sans',sans-serif;color:#222222;} @@ -641,15 +646,10 @@ h1,h2,h3,h4,h5,h6,.brand{font-weight:700;} form.navbar-form,form.navbar-search{border-top:0px solid #eee;border-bottom:0px solid #eee;} .navbar-search .search-query,.navbar-search .search-query:hover{border:1px solid #eeeeee;color:#222222;}.navbar-search .search-query :-moz-placeholder,.navbar-search .search-query:hover :-moz-placeholder{color:#888888;} .navbar-search .search-query::-webkit-input-placeholder,.navbar-search .search-query:hover::-webkit-input-placeholder{color:#888888;} -.dropdown-menu{background-color:#fafafc;}.dropdown-menu a{color:#222222;} +.dropdown-menu{background-color:#fcfbfd;}.dropdown-menu a{color:#222222;} .dropdown-menu li:hover>a{background-color:#eee;color:#222222;} -div.subnav{background-color:#fafafc;background-image:none;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);} +div.subnav{background-color:#fcfbfd;background-image:none;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);box-shadow:0 1px 2px rgba(0, 0, 0, 0.25);} .navbar .nav-collapse .nav li>a,div.subnav .nav>li>a:hover,div.subnav .nav>.active>a,div.subnav .nav>.active>a:hover{color:#222222;text-decoration:none;font-weight:normal;} .btn-primary{background-color:#2a2a2a;background-image:-moz-linear-gradient(top, #2f2f2f, #222222);background-image:-ms-linear-gradient(top, #2f2f2f, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#2f2f2f), to(#222222));background-image:-webkit-linear-gradient(top, #2f2f2f, #222222);background-image:-o-linear-gradient(top, #2f2f2f, #222222);background-image:linear-gradient(top, #2f2f2f, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#2f2f2f', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:DXImageTransform.Microsoft.gradient(enabled = false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#222222;} .btn-primary:active,.btn-primary.active{background-color:#080808 \9;} code,pre,pre.prettyprint,.well,.form-actions,.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#eeeeee;} -.pull-right{float:right;} -.pull-left{float:left;} -.hide{display:none;} -.show{display:block;} -.invisible{visibility:hidden;} diff --git a/journal/index.html b/journal/index.html index e697b375..fa6761b2 100755 --- a/journal/index.html +++ b/journal/index.html @@ -321,6 +321,26 @@ </div><!-- /btn-group --> </td> </tr> + <tr> + <td><a class="btn btn-inverse" href="#">Inverse</a></td> + <td><a class="btn btn-inverse btn-large" href="#">Inverse</a></td> + <td><a class="btn btn-inverse btn-small" href="#">Inverse</a></td> + <td><a class="btn btn-inverse disabled" href="#">Inverse</a></td> + <td><a class="btn btn-inverse" href="#"><i class="icon-remove icon-white"></i> Inverse</a></td> + <td> + <div class="btn-group"> + <a class="btn btn-inverse" href="#">Inverse</a> + <a class="btn btn-inverse dropdown-toggle" data-toggle="dropdown" href="#"><span class="caret"></span></a> + <ul class="dropdown-menu"> + <li><a href="#">Action</a></li> + <li><a href="#">Another action</a></li> + <li><a href="#">Something else here</a></li> + <li class="divider"></li> + <li><a href="#">Separated link</a></li> + </ul> + </div><!-- /btn-group --> + </td> + </tr> </tbody> </table> diff --git a/journal/variables.less b/journal/variables.less index 3df3f10c..e6b01284 100755 --- a/journal/variables.less +++ b/journal/variables.less @@ -7,7 +7,7 @@ // CUSTOM VALUES // ----------------------------------------------------- -@baseBackgroundColor: #FAFAFC; +@baseBackgroundColor: #FCFBFD; |