Skip to content

Commit

Permalink
Moved all SCSS placeholders to the root of each file since ignored ot…
Browse files Browse the repository at this point in the history 
…herwise
  • Loading branch information
@pjackson28
pjackson28 committed Mar 15, 2014
1 parent 6c841c7 commit 8d116d6
Show file tree
Hide file tree
Showing 37 changed files with 123 additions and 114 deletions.
2 changes: 1 addition & 1 deletion site/data/i18n/af.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/ar.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/bg.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/cs.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/de.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/el.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/en.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/es.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/et.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/hi.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/hu.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/hy.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/is.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/it.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/ja.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/ko.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/lt.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/lv.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/nl.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/pl.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/pt.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/ru.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/sk.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/sq.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/th.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/tr.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/uk.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/vi.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
2 changes: 1 addition & 1 deletion site/data/i18n/zh.json
View file
Expand Up @@ -213,7 +213,7 @@
"tmpl-health-url": "healthycanadians.gc.ca",
"tmpl-travel": "Travel",
"tmpl-travel-url": "travel.gc.ca",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada": "Service Canada",
"tmpl-servicecanada-url": "servicecanada.gc.ca",
"tmpl-jobs": "Jobs",
"tmpl-jobs-url": "jobbank.gc.ca",
Expand Down
10 changes: 6 additions & 4 deletions src/plugins/calendar/calendar-base.scss
View file
Expand Up @@ -5,6 +5,12 @@
%cal-position-relative {
position: relative;
}

%cal-goto-btns {
display: inline-block;
margin: 10px 5px;
}

.cal-cnt {
width: 18em;
text-shadow: none;
Expand All @@ -27,10 +33,6 @@
.cal-goto {
display: inline-block;
}
%cal-goto-btns {
display: inline-block;
margin: 10px 5px;
}
.cal-goto-mnth {
@extend %cal-goto-btns;
@extend %cal-position-relative;
Expand Down
13 changes: 6 additions & 7 deletions src/plugins/menu/menu.scss
View file
Expand Up @@ -104,6 +104,9 @@
}
}

%menu-mb-pnl-margin-bottom-5px {
margin-bottom: 5px;
}
#mb-pnl {
ul {
margin-bottom: 0;
Expand All @@ -120,9 +123,6 @@
}
}

%menu-mb-pnl-margin-bottom-5px {
margin-bottom: 5px;
}
.srch-pnl {
form {
white-space: nowrap;
Expand All @@ -149,11 +149,10 @@
}
}

%menu-noscript-display-block-important {
display: block !important;
}
.wb-disable {
%menu-noscript-display-block-important {
display: block !important;
}

#wb-glb-mn {
display: none !important;
}
Expand Down
10 changes: 5 additions & 5 deletions src/plugins/multimedia/multimedia.scss
View file
Expand Up @@ -157,18 +157,18 @@
transition: all 0.26s ease;
}

%pnl {
vertical-align: middle;
display: table-cell;
}

.wb-mm-ctrls {
display: table;
background: #000;
color: #fff;
position: relative;
width: 100%;

%pnl {
vertical-align: middle;
display: table-cell;
}

.frstpnl {
@extend %pnl;
width: 6em;
Expand Down
15 changes: 7 additions & 8 deletions src/plugins/overlay/overlay-ie8.scss
View file
Expand Up @@ -6,15 +6,14 @@
/*
* Overlay base
*/
.ie8 {
%overlay-ie8-border-left-999 {
border-left: 1px solid #999;
}

%overlay-ie8-border-right-999 {
border-left: 1px solid #999;
}
%overlay-ie8-border-left-999 {
border-left: 1px solid #999;
}

%overlay-ie8-border-right-999 {
border-left: 1px solid #999;
}
.ie8 {
.wb-panel-l {
@extend %overlay-ie8-border-right-999;
}
Expand Down

0 comments on commit 8d116d6

Please sign in to comment.