Merge branch 'dev'
This commit is contained in:
commit
84ebf78dc0
2 changed files with 7 additions and 2 deletions
4
theme/bootstrapdark/static/bootstrap.min.css
vendored
4
theme/bootstrapdark/static/bootstrap.min.css
vendored
|
@ -313,8 +313,8 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span
|
||||||
.table-hover tbody tr.error:hover td{background-color:#e1e1e1;}
|
.table-hover tbody tr.error:hover td{background-color:#e1e1e1;}
|
||||||
.table-hover tbody tr.warning:hover td{background-color:#e1e1e1;}
|
.table-hover tbody tr.warning:hover td{background-color:#e1e1e1;}
|
||||||
.table-hover tbody tr.info:hover td{background-color:#e1e1e1;}
|
.table-hover tbody tr.info:hover td{background-color:#e1e1e1;}
|
||||||
[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;}
|
[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;*margin-right:.3em;line-height:14px;vertical-align:text-top;background-image:url("../images/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;margin-top:1px;}
|
||||||
.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:url("../img/glyphicons-halflings-white.png");}
|
.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:url("../images/glyphicons-halflings-white.png");}
|
||||||
.icon-glass{background-position:0 0;}
|
.icon-glass{background-position:0 0;}
|
||||||
.icon-music{background-position:-24px 0;}
|
.icon-music{background-position:-24px 0;}
|
||||||
.icon-search{background-position:-48px 0;}
|
.icon-search{background-position:-48px 0;}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
div.highlight pre {
|
div.highlight pre {
|
||||||
|
/* background-color: #fefbf3; */
|
||||||
background-color: #fefbf3;
|
background-color: #fefbf3;
|
||||||
margin: 0 0 10px;
|
margin: 0 0 10px;
|
||||||
}
|
}
|
||||||
|
@ -63,3 +64,7 @@ h2 > a { color: rgb(200, 200, 200) }
|
||||||
.social a[href*='stackoverflow.com']:before {content: url('./images/icons/stackoverflow.png');}
|
.social a[href*='stackoverflow.com']:before {content: url('./images/icons/stackoverflow.png');}
|
||||||
.social a[href*='twitch.tv']:before {content: url('./images/icons/twitch.png');}
|
.social a[href*='twitch.tv']:before {content: url('./images/icons/twitch.png');}
|
||||||
.social a[href*='twitter.com']:before {content: url('./images/icons/twitter.png');}
|
.social a[href*='twitter.com']:before {content: url('./images/icons/twitter.png');}
|
||||||
|
|
||||||
|
code {
|
||||||
|
color: #208050;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue