Author: sevein
Date: Wed Mar 28 17:41:21 2012
New Revision: 11305
Log:
Cleanups, rename some files, remove unneeeded, recompile
Added:
trunk/plugins/qtDominionPlugin/css/less/_header.less
- copied, changed from r11303,
trunk/plugins/qtDominionPlugin/css/less/_header-ac.less
Deleted:
trunk/plugins/qtDominionPlugin/css/less/_header-ac.less
trunk/plugins/qtDominionPlugin/css/less/_header-dominion.less
Modified:
trunk/plugins/qtDominionPlugin/css/less/_scaffolding.less
trunk/plugins/qtDominionPlugin/css/less/main.css
trunk/plugins/qtDominionPlugin/css/main.less
Copied and modified: trunk/plugins/qtDominionPlugin/css/less/_header.less (from
r11303, trunk/plugins/qtDominionPlugin/css/less/_header-ac.less)
==============================================================================
--- trunk/plugins/qtDominionPlugin/css/less/_header-ac.less Wed Mar 28
16:33:56 2012 (r11303, copy source)
+++ trunk/plugins/qtDominionPlugin/css/less/_header.less Wed Mar 28
17:41:21 2012 (r11305)
@@ -21,17 +21,15 @@
#header-nav {
.pull-right;
+ margin-bottom: 0;
> li > a {
.border-radius(0);
margin-top: 0px;
margin-bottom: 0px;
-
- // FIXME
font-family: @smallFontFamily;
font-size: 16px;
-
font-variant: small-caps;
text-transform: lowercase;
font-weight: bold;
@@ -56,8 +54,8 @@
#logo-and-name h1 {
- margin-left: 20px;
- margin-top: -10px;
+ margin-left: 10px;
+ margin-top: -6px;
}
Modified: trunk/plugins/qtDominionPlugin/css/less/_scaffolding.less
==============================================================================
--- trunk/plugins/qtDominionPlugin/css/less/_scaffolding.less Wed Mar 28
17:36:10 2012 (r11304)
+++ trunk/plugins/qtDominionPlugin/css/less/_scaffolding.less Wed Mar 28
17:41:21 2012 (r11305)
@@ -1,6 +1,6 @@
html, body {
background-color: @white;
- background-image: url(../../images/background.png);
+ background-image: url(../../images/background.png);
}
#wrapper {
@@ -75,7 +75,7 @@
font-size: 30px;
margin-top:20px;
margin-bottom: 10px;
-
+
img {
margin-right:10px;
display: inline;
@@ -111,7 +111,7 @@
float:left;
padding: 0;
display:block;
-
+
h2 {
text-align: left;
font-weight: normal;
@@ -119,24 +119,24 @@
padding: 5px;
margin: 0;
line-height: 110%;
-
+
a {
- text-decoration: none;
- display: inline;
+ text-decoration: none;
+ display: inline;
line-height: 110%;
color: @white;
-
+
} &:hover {
background-color: @white;
text-decoration: none;
a {
-
+
color: @orange;
}
}
}
-
+
h2.active {
background-color: @white;
a {
@@ -150,13 +150,13 @@
height:142px;
width:142px;
margin: 0 15px 15px 0;
-
+
h2 {
font-size: 21px;
height:134px;
width:134px;
-
- a {
+
+ a {
width: 134px;
//padding:7px;
}
@@ -168,26 +168,26 @@
height:95px;
width:95px;
margin: 0 5px 0 0;
-
+
h2 {
font-size: 11px;
height: 88px;
- width: 88px;
+ width: 88px;
padding: 4px;
-
+
a {
- width: 85px;
+ width: 85px;
}
}
}
.img {
background-color: @white;
-
+
h2:first-child { .hide; }
h2:last-child {
background-color: @white;
-
+
a {
padding:0;
height: 144px;
@@ -199,16 +199,16 @@
background-color:@white;
h2 {
background-color:@white;
-
+
a {
color: @grayDark;
-
+
&:hover {
color: @orange;
}
}
}
-
+
h2.active {
background-color: @white !important;
a {
@@ -226,25 +226,25 @@
padding: 0;
text-shadow: none;
.box-shadow(none);
-
+
li {
a {
font-family: @smallFontFamily;
color: @grayDark;
font-size: 10px;
margin-left:0;
-
+
&:hover {
text-decoration: none;
color: @orange;
}
}
}
-
+
li:after {
content: " › ";
}
-
+
li:last-child:after {
content:" ";
}
@@ -254,55 +254,16 @@
.nav-tabs {
font-family: @smallFontFamily;
-
+
li a {
color: @white;
-
+
&:hover {
color:@orange;
}
}
-
+
li.active a {
color: @orange;
}
}
-
-
-// Portrait tablet to landscape and desktop
-@media (min-width: 768px) {
- .mobileonly {
- .hide;
- }
- .desktoponly {
- .show;
- }
-}
-
-
-// Mobile
-@media (max-width: 768px) {
-
- #wrapper {
- margin-left:0;
- margin-right:0;
- padding-left:0;
- padding-right:0;
- margin-top:10px;
- }
-
- .mobileonly {
- .show;
- }
- .desktoponly {
- .hide;
- }
- #footer {
- .hide;
- }
- .mini {
- margin-bottom:5px !important;
- }
-}
-
-
Modified: trunk/plugins/qtDominionPlugin/css/less/main.css
==============================================================================
--- trunk/plugins/qtDominionPlugin/css/less/main.css Wed Mar 28 17:36:10
2012 (r11304)
+++ trunk/plugins/qtDominionPlugin/css/less/main.css Wed Mar 28 17:41:21
2012 (r11305)
@@ -852,7 +852,7 @@
ul.breadcrumb li:last-child:after{content:" ";}
.nav-tabs{font-family:Arial,Verdana,sans-serif;}.nav-tabs li
a{color:#ffffff;}.nav-tabs li a:hover{color:#f6ac00;}
.nav-tabs li.active a{color:#f6ac00;}
-@media (min-width:768px){.mobileonly{display:none;}
.desktoponly{display:block;}}@media
(max-width:768px){#wrapper{margin-left:0;margin-right:0;padding-left:0;padding-right:0;margin-top:10px;}
.mobileonly{display:block;} .desktoponly{display:none;} #footer{display:none;}
.mini{margin-bottom:5px !important;}}.btn{display:inline-block;padding:4px 10px
4px;font-size:13px;font-family:'Droid
Serif','Georgia','Times',serif;line-height:18px;color:#ffffff;text-align:center;text-shadow:none;text-transform:capitalize;border:2px
solid
#ffffff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;cursor:pointer;background:none;margin:0
10px 0 0;*margin-left:.3em;}.btn:first-child{*margin-left:0;}
+.btn{display:inline-block;padding:4px 10px
4px;font-size:13px;font-family:'Droid
Serif','Georgia','Times',serif;line-height:18px;color:#ffffff;text-align:center;text-shadow:none;text-transform:capitalize;border:2px
solid
#ffffff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;cursor:pointer;background:none;margin:0
10px 0 0;*margin-left:.3em;}.btn:first-child{*margin-left:0;}
.btn:first-child{*margin-left:0;}
.widebtn{display:block;padding:4px 10px 4px;font-size:13px;font-family:'Droid
Serif','Georgia','Times',serif;line-height:18px;color:#ffffff;text-align:center;text-shadow:none;text-transform:capitalize;border:2px
solid
#ffffff;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;cursor:pointer;background:none;margin:0;*margin-left:.3em;}.widebtn:first-child{*margin-left:0;}
.widebtn:first-child{*margin-left:0;}
@@ -891,10 +891,10 @@
button.btn.large,input[type="submit"].btn.large{*padding-top:7px;*padding-bottom:7px;}
button.btn.small,input[type="submit"].btn.small{*padding-top:3px;*padding-bottom:3px;}
#header{position:fixed;z-index:1000;top:0;left:0;right:0;border-bottom:1px
solid
#0a3e94;background-color:#fff2d4;background-image:-webkit-gradient(linear, 0 0,
0 100%, from(#ffffff), color-stop(30%, #ffffff),
to(#ffbf2a));background-image:-webkit-linear-gradient(#ffffff, #ffffff 30%,
#ffbf2a);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 30%,
#ffbf2a);background-image:-ms-linear-gradient(#ffffff, #ffffff 30%,
#ffbf2a);background-image:-o-linear-gradient(#ffffff, #ffffff 30%,
#ffbf2a);background-image:linear-gradient(#ffffff, #ffffff 30%,
#ffbf2a);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',
endColorstr='#ffbf2a', GradientType=0);-webkit-box-shadow:0 3px 3px rgba(0, 0,
0, 0.25);-moz-box-shadow:0 3px 3px rgba(0, 0, 0, 0.25);box-shadow:0 3px 3px
rgba(0, 0, 0, 0.25);}#header .container{margin-left:auto;margin-right:auto;}
-#header-nav{float:right;}#header-nav>li>a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;margin-top:0px;margin-bottom:0px;font-family:Arial,Verdana,sans-serif;font-size:16px;font-variant:small-caps;text-transform:lowercase;font-weight:bold;color:#c2c2c2;}#header-nav>li>a:hover{color:#f6ac00;background-color:#3b3b3b;}
+#header-nav{float:right;margin-bottom:0;}#header-nav>li>a{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;margin-top:0px;margin-bottom:0px;font-family:Arial,Verdana,sans-serif;font-size:16px;font-variant:small-caps;text-transform:lowercase;font-weight:bold;color:#c2c2c2;}#header-nav>li>a:hover{color:#f6ac00;background-color:#3b3b3b;}
#header-council{float:right;}
-#logo-and-name h1{margin-left:20px;margin-top:-10px;}
-#header-search{overflow:hidden;margin-top:10px;}#header-search form
input[name="query"]{color:#c2c2c2;font-size:19px;padding:6px 8px 2px
8px;border:none;border-bottom:2px solid
#c2c2c2;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;display:block;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}#header-search
form input[name="query"]:hover{border-bottom:2px solid #3b3b3b;}
+#logo-and-name h1{margin-left:10px;margin-top:-6px;}
+#header-search{overflow:hidden;margin-top:10px;}#header-search form
input[name="query"]{color:#c2c2c2;font-size:19px;padding:6px 8px 2px
8px;border:none;border-bottom:2px solid
#c2c2c2;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;display:block;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;width:100%;height:30px;}#header-search
form input[name="query"]:hover{border-bottom:2px solid #3b3b3b;}
#header-search form input[name="query"]:focus,#header-search form
input[name="query"].focused{border-bottom:2px solid #3b3b3b;color:#3b3b3b;}
#search-suggestions{position:fixed;z-index:1010;-webkit-box-shadow:0 1px 3px
rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25);box-shadow:0
1px 3px rgba(0, 0, 0,
0.25);background-color:#f8f8f8;background-image:-webkit-gradient(linear, 0 0, 0
100%, from(#ffffff), color-stop(70%, #ffffff),
to(#dbdbdb));background-image:-webkit-linear-gradient(#ffffff, #ffffff 70%,
#dbdbdb);background-image:-moz-linear-gradient(top, #ffffff, #ffffff 70%,
#dbdbdb);background-image:-ms-linear-gradient(#ffffff, #ffffff 70%,
#dbdbdb);background-image:-o-linear-gradient(#ffffff, #ffffff 70%,
#dbdbdb);background-image:linear-gradient(#ffffff, #ffffff 70%,
#dbdbdb);background-repeat:no-repeat;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff',
endColorstr='#dbdbdb',
GradientType=0);}#search-suggestions>.div{margin-left:0;}
#search-suggestions .group{border-bottom:1px solid #c2c2c2;padding:5px 0 5px
6px;*zoom:1;}#search-suggestions .group:before,#search-suggestions
.group:after{display:table;content:"";}
@@ -905,7 +905,7 @@
#search-suggestions .group ul{padding-left:18px;}#search-suggestions .group ul
li{display:block;float:none;margin:0 0 0 0;padding:0;}#search-suggestions
.group ul li
a{text-transform:none;font-variant:normal;color:#0a3e94;padding:2px
0;font-size:14px;}#search-suggestions .group ul li a
span{font-family:Arial,Verdana,sans-serif;text-transform:uppercase;color:#6d6d6d;font-size:10px;padding:0
10px;}
#search-suggestions .group ul li.showall{font-style:oblique;}
#search-suggestions
div:last-child{border-bottom:none;text-transform:lowercase;font-variant:small-caps;margin:2px
0;font-size:15px;}#search-suggestions div:last-child a{padding-right:15px;}
-@media
(max-width:767px){#header{margin-left:-20px;margin-right:-20px;position:static;}#header
.container>.row:first-child{display:none;} #logo-and-name h1{margin:10px 0 0
0;text-align:center;} #header-search{margin:20px 10px 0 10px;}#header-search
input[name="query"]{border:2px solid #c2c2c2
!important;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;width:100%;height:30px;}}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
+@media
(max-width:768px){#header{margin-left:-20px;margin-right:-20px;position:static;}#header
.container>.row:first-child{display:none;} #logo-and-name h1{margin:10px 0 0
0;text-align:center;} #header-search{margin:20px 10px 0 10px;}#header-search
input[name="query"]{border:2px solid #c2c2c2
!important;}}.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
.popover.right{margin-left:5px;}
.popover.bottom{margin-top:5px;}
.popover.left{margin-left:-5px;}
Modified: trunk/plugins/qtDominionPlugin/css/main.less
==============================================================================
--- trunk/plugins/qtDominionPlugin/css/main.less Wed Mar 28 17:36:10
2012 (r11304)
+++ trunk/plugins/qtDominionPlugin/css/main.less Wed Mar 28 17:41:21
2012 (r11305)
@@ -1,8 +1,8 @@
+// Load bootstrap files
+// Ralf didn't like wells, pagination and pager, why?
@import "../vendor/bootstrap/less/bootstrap";
@import "../vendor/bootstrap/less/responsive";
-// Ralf commented these files, why? wells, pagination, pager
-
// Archives Canada brand colors
@blue: #0a3e94;
@orange: #f6ac00;
@@ -25,13 +25,14 @@
// Archives Canada CSS files (written in LESS)
@import "less/_scaffolding";
@import "less/_buttons";
-@import "less/_header-ac";
+@import "less/_header";
// Not needed for now
// @import "less/_misc";
// @import "less/_content";
// @import "less/_forms";
+// Other stuff
@import "less/_popovers";
@import "less/_search";
@import "less/_homepage";
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
