Browse files

Merged CSS for the toolbar in both embedded mode (on each page) and p…

…rofiler.
  • Loading branch information...
1 parent cd53483 commit a9afdd04a47297d41761c348147006590ce9b53d @shiroyuki shiroyuki committed Apr 13, 2012
View
205 Resources/public/css/toolbar.css
@@ -5,207 +5,4 @@ http://developer.yahoo.com/yui/license.html
version: 3.1.2
build: 56
*/
-.sf-toolbarreset div,.sf-toolbarreset dl,.sf-toolbarreset dt,.sf-toolbarreset dd,.sf-toolbarreset ul,.sf-toolbarreset ol,.sf-toolbarreset li,.sf-toolbarreset h1,.sf-toolbarreset h2,.sf-toolbarreset h3,.sf-toolbarreset h4,.sf-toolbarreset h5,.sf-toolbarreset h6,.sf-toolbarreset pre,.sf-toolbarreset code,.sf-toolbarreset form,.sf-toolbarreset fieldset,.sf-toolbarreset legend,.sf-toolbarreset input,.sf-toolbarreset textarea,.sf-toolbarreset p,.sf-toolbarreset blockquote,.sf-toolbarreset th,.sf-toolbarreset td{margin:0;padding:0;}.sf-toolbarreset table{border-collapse:collapse;border-spacing:0;}.sf-toolbarreset fieldset,.sf-toolbarreset img{border:0;}.sf-toolbarreset address,.sf-toolbarreset caption,.sf-toolbarreset cite,.sf-toolbarreset code,.sf-toolbarreset dfn,.sf-toolbarreset em,.sf-toolbarreset strong,.sf-toolbarreset th,.sf-toolbarreset var{font-style:normal;font-weight:normal;}.sf-toolbarreset li{list-style:none;}.sf-toolbarreset caption,.sf-toolbarreset th{text-align:left;}.sf-toolbarreset h1,.sf-toolbarreset h2,.sf-toolbarreset h3,.sf-toolbarreset h4,.sf-toolbarreset h5,.sf-toolbarreset h6{font-size:100%;font-weight:normal;}.sf-toolbarreset q:before,.sf-toolbarreset q:after{content:'';}.sf-toolbarreset abbr,.sf-toolbarreset acronym{border:0;font-variant:normal;}.sf-toolbarreset sup{vertical-align:text-top;}.sf-toolbarreset sub{vertical-align:text-bottom;}.sf-toolbarreset input,.sf-toolbarreset textarea,.sf-toolbarreset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-toolbarreset input,.sf-toolbarreset textarea,.sf-toolbarreset select{*font-size:100%;}.sf-toolbarreset legend{color:#000;}
-
-.sf-toolbarreset {
- background: #cbcbcb;
- background-image: -moz-linear-gradient(-90deg, #e8e8e8, #cbcbcb);
- background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#e8e8e8), to(#cbcbcb));
- top: 0;
- left: 0;
- right: 0;
- height: 38px;
- margin: 0;
- padding: 0 40px 0 0;
- z-index: 6000000;
- border-bottom: 1px solid #bbb;
- font: 11px Verdana, Arial, sans-serif;
- color: #000;
-}
-
-.sf-toolbarreset abbr {
- border-bottom: 1px dotted #000000;
- cursor: help;
-}
-
-.sf-toolbar-block {
- white-space: nowrap;
- color: #2f2f2f;
- display: block;
- min-height: 28px;
- border-right: 1px solid #cdcdcd;
- padding: 0;
- float: left;
-}
-
-.sf-toolbar-block span {
- display: inline-block;
-}
-
-.sf-toolbar-block .sf-toolbar-info-piece {
- padding-top: 5px;
-}
-
-.sf-toolbar-block .sf-toolbar-info-piece:first-child {
- padding-top: 0;
-}
-
-.sf-toolbar-block .sf-toolbar-info-piece b {
- display: inline-block;
- width: 110px;
-}
-
-.sf-toolbar-block .sf-toolbar-info-with-next-pointer:after {
- content: '::';
- color: #999;
-}
-
-.sf-toolbar-block .sf-toolbar-info-with-delimiter {
- border-right: 1px solid #ccc;
- padding-right: 5px;
- margin-right: 5px;
-}
-
-.sf-toolbar-block .sf-toolbar-info {
- display: none;
- position: absolute;
- top: 38px;
- background-color: #fff;
- border: 1px solid #bbb;
- border-top: 1px solid #fff;
- padding: 10px 8px;
- margin-left: -1px;
-}
-
-.sf-toolbar-block .sf-toolbar-info:empty {
- display: none !important;
-}
-
-.sf-toolbar-block .sf-toolbar-status {
- display: inline-block;
- color: #fff;
- background-color: #666;
- padding: 3px 6px;
- border-radius: 3px;
- margin-bottom: 2px;
- vertical-align: middle;
- min-width: 6px;
- min-height: 13px;
-}
-
-.sf-toolbar-block .sf-toolbar-status-green {
- background-color: #759e1a;
-}
-
-.sf-toolbar-block .sf-toolbar-status-red {
- background-color: #a33;
-}
-
-.sf-toolbar-block .sf-toolbar-status-yellow {
- background-color: #ffcc00;
- color: #000;
-}
-
-.sf-toolbar-block .sf-toolbar-status-black {
- background-color: #000;
-}
-
-.sf-toolbar-block .sf-toolbar-icon {
- display: block;
-}
-
-.sf-toolbar-block .sf-toolbar-icon > a,
-.sf-toolbar-block .sf-toolbar-icon > span {
- display: block;
- text-decoration: none;
- margin: 0;
- padding: 5px 8px;
- min-width: 20px;
- text-align: center;
- vertical-align: middle;
-}
-
-.sf-toolbar-block .sf-toolbar-icon > a,
-.sf-toolbar-block .sf-toolbar-icon > a:link
-.sf-toolbar-block .sf-toolbar-icon > a:hover {
- color: black !important;
-}
-
-.sf-toolbar-block .sf-toolbar-icon img {
- border-width: 0;
- vertical-align: middle;
-}
-
-.sf-toolbar-block .sf-toolbar-icon img + span {
- margin-left: 5px;
- margin-top: 2px;
-}
-
-.sf-toolbar-block .sf-toolbar-icon .sf-toolbar-status {
- border-radius: 12px;
- border-bottom-left-radius: 0px;
- margin-top: 0;
-}
-
-.sf-toolbar-block .sf-toolbar-info-piece-additional:empty {
- display: none;
-}
-
-.sf-toolbar-info-php {}
-.sf-toolbar-info-php-ext {}
-
-.sf-toolbar-info-php-ext .sf-toolbar-status {
- margin-left: 2px;
-}
-
-.sf-toolbar-info-php-ext .sf-toolbar-status:first-child {
- margin-left: 0;
-}
-
-.sf-toolbar-block .sf-toolbar-info-piece-additional {
- display: inline-block;
-}
-
-.sf-toolbarreset:hover {
- box-shadow: rgba(0, 0, 0, 0.3) 0 0 50px;
-}
-
-.sf-toolbar-block:hover {
- box-shadow: rgba(0, 0, 0, 0.3) 0 0 5px;
-}
-
-.sf-toolbar-block:hover .sf-toolbar-icon {
- background-color: #fff;
-}
-.sf-toolbar-block:hover .sf-toolbar-info {
- display: block;
-}
-
-/***** Media query *****/
-@media screen and (max-width: 780px) {
- .sf-toolbar-block .sf-toolbar-icon > * > :first-child ~ * {
- display: none;
- }
-
- .sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional {
- display: none !important;
- }
-}
-
-@media screen and (min-width: 880px) {
- .sf-toolbar-block .sf-toolbar-icon a[href$="config"] .sf-toolbar-info-piece-additional {
- display: inline-block;
- }
-}
-
-@media screen and (min-width: 980px) {
- .sf-toolbar-block .sf-toolbar-icon a[href$="security"] .sf-toolbar-info-piece-additional {
- display: inline-block;
- }
-}
-
-@media screen and (max-width: 1180px) {
- .sf-toolbar-block .sf-toolbar-icon > * > .sf-toolbar-info-piece-additional {
- display: none;
- }
-}
+.sf-toolbarreset div,.sf-toolbarreset dl,.sf-toolbarreset dt,.sf-toolbarreset dd,.sf-toolbarreset ul,.sf-toolbarreset ol,.sf-toolbarreset li,.sf-toolbarreset h1,.sf-toolbarreset h2,.sf-toolbarreset h3,.sf-toolbarreset h4,.sf-toolbarreset h5,.sf-toolbarreset h6,.sf-toolbarreset pre,.sf-toolbarreset code,.sf-toolbarreset form,.sf-toolbarreset fieldset,.sf-toolbarreset legend,.sf-toolbarreset input,.sf-toolbarreset textarea,.sf-toolbarreset p,.sf-toolbarreset blockquote,.sf-toolbarreset th,.sf-toolbarreset td{margin:0;padding:0;}.sf-toolbarreset table{border-collapse:collapse;border-spacing:0;}.sf-toolbarreset fieldset,.sf-toolbarreset img{border:0;}.sf-toolbarreset address,.sf-toolbarreset caption,.sf-toolbarreset cite,.sf-toolbarreset code,.sf-toolbarreset dfn,.sf-toolbarreset em,.sf-toolbarreset strong,.sf-toolbarreset th,.sf-toolbarreset var{font-style:normal;font-weight:normal;}.sf-toolbarreset li{list-style:none;}.sf-toolbarreset caption,.sf-toolbarreset th{text-align:left;}.sf-toolbarreset h1,.sf-toolbarreset h2,.sf-toolbarreset h3,.sf-toolbarreset h4,.sf-toolbarreset h5,.sf-toolbarreset h6{font-size:100%;font-weight:normal;}.sf-toolbarreset q:before,.sf-toolbarreset q:after{content:'';}.sf-toolbarreset abbr,.sf-toolbarreset acronym{border:0;font-variant:normal;}.sf-toolbarreset sup{vertical-align:text-top;}.sf-toolbarreset sub{vertical-align:text-bottom;}.sf-toolbarreset input,.sf-toolbarreset textarea,.sf-toolbarreset select{font-family:inherit;font-size:inherit;font-weight:inherit;}.sf-toolbarreset input,.sf-toolbarreset textarea,.sf-toolbarreset select{*font-size:100%;}.sf-toolbarreset legend{color:#000;}
View
1 Resources/views/Profiler/base.html.twig
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="{{ asset('bundles/webprofiler/css/toolbar.css') }}" />
<link rel="stylesheet" href="{{ asset('bundles/webprofiler/css/profiler.css') }}" />
{% endblock %}
+ {% include 'WebProfilerBundle:Profiler:toolbar_style.html.twig' with { 'position': 'top', 'floatable': false } %}
</head>
<body>
{% block body '' %}
View
2 Resources/views/Profiler/toolbar.html.twig
@@ -1,6 +1,6 @@
<!-- START of Symfony2 Web Debug Toolbar -->
{% if 'normal' != position %}
- {% include 'WebProfilerBundle:Profiler:toolbar_style.html.twig' with { 'position': position } %}
+ {% include 'WebProfilerBundle:Profiler:toolbar_style.html.twig' with { 'position': position, 'floatable': true } %}
{% endif %}
<div class="sf-toolbarreset">
View
17 Resources/views/Profiler/toolbar_style.html.twig
@@ -190,12 +190,29 @@
background-image: -moz-linear-gradient(-90deg, #ffffff, #e4e4e4);
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#ffffff), to(#e4e4e4));
top: 0;
+ bottom: auto;
border-bottom: 1px solid #bbb;
}
.sf-toolbar-block .sf-toolbar-info {
top: 38px;
+ bottom: auto;
border-top: 1px solid #fff;
+ border-bottom: 1px solid #bbb;
+ }
+ {% endif %}
+
+ {% if not floatable %}
+ .sf-toolbarreset {
+ position: static;
+ background: #cbcbcb;
+ background-image: -moz-linear-gradient(-90deg, #e8e8e8, #cbcbcb) !important;
+ background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(#e8e8e8), to(#cbcbcb)) !important;
+ }
+
+ .sf-toolbarreset abbr {
+ border-bottom: 1px dotted #000000;
+ cursor: help;
}
{% endif %}

0 comments on commit a9afdd0

Please sign in to comment.