diff --git a/sites/all/modules/gui/materiobasemod/materio_user.module b/sites/all/modules/gui/materiobasemod/materio_user.module index 58e90342..a3b1e3c5 100755 --- a/sites/all/modules/gui/materiobasemod/materio_user.module +++ b/sites/all/modules/gui/materiobasemod/materio_user.module @@ -146,7 +146,7 @@ function materio_user_block_view($delta = '') { break; case 'front_link': $block['subject'] = ''; - $block['content'] = l(''.t('home').'', '', array('html'=>true)); + $block['content'] = l(''.t('home').'', '', array('html'=>true)); break; } return $block; diff --git a/sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/misc.scssc b/sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/misc.scssc index 79b081a5..900582ff 100644 Binary files a/sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/misc.scssc and b/sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/misc.scssc differ diff --git a/sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/styles.scssc b/sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/styles.scssc index 59a5c5e8..1bbbd79e 100644 Binary files a/sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/styles.scssc and b/sites/all/themes/gui/materiobasetheme/.sass-cache/717d9e279c4e218b7de53140fde49b287dcd16a4/styles.scssc differ diff --git a/sites/all/themes/gui/materiobasetheme/css/misc.css b/sites/all/themes/gui/materiobasetheme/css/misc.css index 075d9ee4..bcaf8b07 100644 --- a/sites/all/themes/gui/materiobasetheme/css/misc.css +++ b/sites/all/themes/gui/materiobasetheme/css/misc.css @@ -9,7 +9,7 @@ Error: Undefined mixin 'fs12'. 9: -moz-border-radius: 5px; 10: -webkit-border-radius: 5px; 11: border-radius: 5px; -12: @include fs12(); +12: @include fs12; 13: 14: &.warning { 15: color: #c09853;//#840; @@ -90,4 +90,4 @@ Backtrace: body:before { white-space: pre; font-family: monospace; - content: "Error: Undefined mixin 'fs12'.\A on line 12 of /home/sarahgarcin/Sites/materio/base_d7/sites/all/themes/gui/materiobasetheme/scss/misc.scss, in `fs12'\A from line 12 of /home/sarahgarcin/Sites/materio/base_d7/sites/all/themes/gui/materiobasetheme/scss/misc.scss, in `messages'\A from line 36 of /home/sarahgarcin/Sites/materio/base_d7/sites/all/themes/gui/materiobasetheme/scss/misc.scss\A \A 7: background: #d9edf7;//#cf8;\A 8: border: 1px solid #bce8f1;//#be7;\A 9: -moz-border-radius: 5px;\A 10: -webkit-border-radius: 5px;\A 11: border-radius: 5px;\A 12: @include fs12();\A 13: \A 14: &.warning {\A 15: color: #c09853;//#840;\A 16: background-color: #fcf8e3;//#fe6;\A 17: border-color: #fbeed5;//#ed5;"; } + content: "Error: Undefined mixin 'fs12'.\A on line 12 of /home/sarahgarcin/Sites/materio/base_d7/sites/all/themes/gui/materiobasetheme/scss/misc.scss, in `fs12'\A from line 12 of /home/sarahgarcin/Sites/materio/base_d7/sites/all/themes/gui/materiobasetheme/scss/misc.scss, in `messages'\A from line 36 of /home/sarahgarcin/Sites/materio/base_d7/sites/all/themes/gui/materiobasetheme/scss/misc.scss\A \A 7: background: #d9edf7;//#cf8;\A 8: border: 1px solid #bce8f1;//#be7;\A 9: -moz-border-radius: 5px;\A 10: -webkit-border-radius: 5px;\A 11: border-radius: 5px;\A 12: @include fs12;\A 13: \A 14: &.warning {\A 15: color: #c09853;//#840;\A 16: background-color: #fcf8e3;//#fe6;\A 17: border-color: #fbeed5;//#ed5;"; } diff --git a/sites/all/themes/gui/materiobasetheme/css/styles.css b/sites/all/themes/gui/materiobasetheme/css/styles.css index 3d35fe17..453bc8c2 100644 --- a/sites/all/themes/gui/materiobasetheme/css/styles.css +++ b/sites/all/themes/gui/materiobasetheme/css/styles.css @@ -10144,7 +10144,7 @@ html.no-touch #header #header-blocks #block-user-login:hover form#user-login-for /* line 347, ../scss/styles.scss */ #header #header-blocks #block-logintoboggan-logintoboggan-logged-in i { vertical-align: text-bottom; - margin: 0 2px 1px 0; + margin: 0 5px 1px 0; } /* line 351, ../scss/styles.scss */ #header #header-blocks #block-logintoboggan-logintoboggan-logged-in a span.account { @@ -13716,138 +13716,6 @@ div.messages.status { /** * icons */ -/* line 141, ../scss/misc.scss */ -i.icon-materio-viewmode-cardsmall { - background-image: url("../img/sprite.png"); - width: 20px; - height: 20px; - line-height: 20px; - background-position: -42px 0; - background-color: #fff; -} -/* line 143, ../scss/misc.scss */ -i.icon-materio-viewmode-cardsmall.active { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: 0 0; - background-color: #fff; -} -/* line 144, ../scss/misc.scss */ -i.icon-materio-viewmode-cardsmall:hover:not(.active) { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: -21px 0; - background-color: #fff; -} - -/* line 146, ../scss/misc.scss */ -i.icon-materio-viewmode-cardmedium { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: -42px -21px; - background-color: #fff; -} -/* line 148, ../scss/misc.scss */ -i.icon-materio-viewmode-cardmedium.active { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: 0 -21px; - background-color: #fff; -} -/* line 149, ../scss/misc.scss */ -i.icon-materio-viewmode-cardmedium:hover:not(.active) { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: -21px -21px; - background-color: #fff; -} - -/* line 151, ../scss/misc.scss */ -i.icon-materio-viewmode-cardbig { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: -42px -42px; - background-color: #fff; -} -/* line 153, ../scss/misc.scss */ -i.icon-materio-viewmode-cardbig.active { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: 0 -42px; - background-color: #fff; -} -/* line 154, ../scss/misc.scss */ -i.icon-materio-viewmode-cardbig:hover:not(.active) { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: -21px -42px; - background-color: #fff; -} - -/* line 156, ../scss/misc.scss */ -i.icon-materio-viewmode-cardfull { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: -42px -63px; - background-color: #fff; -} -/* line 158, ../scss/misc.scss */ -i.icon-materio-viewmode-cardfull.active { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: 0 -63px; - background-color: #fff; -} -/* line 159, ../scss/misc.scss */ -i.icon-materio-viewmode-cardfull:hover:not(.active) { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: -21px -63px; - background-color: #fff; -} - -/* line 162, ../scss/misc.scss */ -i.icon-materio-search { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: -63px -63px; - background-color: #fff; -} - -/* line 166, ../scss/misc.scss */ -i.icon-materio-folder { - background-image: url("../img/sprite.png"); - width: 21px; - height: 21px; - line-height: 21px; - background-position: -84px -63px; - background-color: #fff; -} - /** * figures */ diff --git a/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.eot b/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.eot new file mode 100644 index 00000000..8efc9140 Binary files /dev/null and b/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.eot differ diff --git a/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.svg b/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.svg new file mode 100644 index 00000000..226d5227 --- /dev/null +++ b/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.svg @@ -0,0 +1,305 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.ttf b/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.ttf new file mode 100644 index 00000000..5287edea Binary files /dev/null and b/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.ttf differ diff --git a/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.woff b/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.woff new file mode 100644 index 00000000..d13c533a Binary files /dev/null and b/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons-custom.woff differ diff --git a/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons.css b/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons.css index f3ccdd03..da821488 100644 --- a/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons.css +++ b/sites/all/themes/gui/materiobasetheme/fonts/icon/foundation-icons.css @@ -15,6 +15,18 @@ font-style: normal; } +@font-face { + font-family: 'foundation-icons-ciconscustom'; + src: url('foundation-icons-custom.eot'); + src: url('foundation-icons-custom.eot?#iefix') format('embedded-opentype'), + url('foundation-icons-custom.woff') format('woff'), + url('foundation-icons-custom.ttf') format('truetype'), + url('foundation-icons-custom.svg#foundation-icons-ciconscustom') format('svg'); + font-weight: normal; + font-style: normal; + +} + .fi-address-book:before, .fi-alert:before, .fi-align-center:before, @@ -307,9 +319,36 @@ -webkit-font-smoothing: antialiased; display: inline-block; text-decoration: inherit; - font-size: 14px; + font-size: 16px; } +/* CUSTOM ICONS */ +.icon-materio-viewmode-cardsmall, +.icon-materio-viewmode-cardmedium, +.icon-materio-viewmode-cardbig, +.icon-materio-viewmode-cardfull, +.icon-materio-folder { + font-family: "foundation-icons-ciconscustom"; + font-style: normal; + font-weight: normal; + font-variant: normal; + text-transform: none; + line-height: 1; + -webkit-font-smoothing: antialiased; + display: inline-block; + text-decoration: inherit; + font-size: 25px; + color: #313131; +} + +.icon-materio-folder{ + color: #007BC2; + font-size: 20px; + +} + +/*FOUNDATION ICONS*/ + .fi-address-book:before { content: "\f100"; } .fi-alert:before { content: "\f101"; } .fi-align-center:before { content: "\f102"; } @@ -593,3 +632,14 @@ .fi-yen:before { content: "\f218"; } .fi-zoom-in:before { content: "\f219"; } .fi-zoom-out:before { content: "\f21a"; } + +/*CUSTOM ICONS*/ +.icon-materio-viewmode-cardsmall.active:before{ content: "\f21b"; } +.icon-materio-viewmode-cardmedium.active:before{ content: "\f21c"; } +.icon-materio-viewmode-cardbig.active:before{ content: "\f21d"; } +.icon-materio-viewmode-cardfull.active:before{ content: "\f21e"; } +.icon-materio-viewmode-cardsmall:before{ content: "\f21f"; } +.icon-materio-viewmode-cardmedium:before{ content: "\f220"; } +.icon-materio-viewmode-cardbig:before{ content: "\f221"; } +.icon-materio-viewmode-cardfull:before{ content: "\f222"; } +.icon-materio-folder:before{ content: "\f223"; } diff --git a/sites/all/themes/gui/materiobasetheme/scss/misc.scss b/sites/all/themes/gui/materiobasetheme/scss/misc.scss index f4f13af5..456db9e0 100644 --- a/sites/all/themes/gui/materiobasetheme/scss/misc.scss +++ b/sites/all/themes/gui/materiobasetheme/scss/misc.scss @@ -9,7 +9,7 @@ -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; - @include fs12(); + @include fs12; &.warning { color: #c09853;//#840; @@ -28,7 +28,7 @@ color: #468847;//#036; background-color: #dff0d8;//#bdf; border-color:#d6e9c6;//#ace; - @include fs14(); + @include fs14; } } @@ -138,34 +138,34 @@ div.messages { @include messages();} // .icon(20px); // } -i.icon-materio-viewmode-cardsmall{ - @include icon(20px, -42px, 0); - &.active{@include icon(21px, 0, 0); } - &:hover:not(.active){@include icon(21px, -21px, 0); } -} -i.icon-materio-viewmode-cardmedium{ - @include icon(21px, -42px, -21px); - &.active{@include icon(21px, 0, -21px); } - &:hover:not(.active){@include icon(21px, -21px, -21px); } -} -i.icon-materio-viewmode-cardbig{ - @include icon(21px, -42px, -42px); - &.active{@include icon(21px, 0, -42px); } - &:hover:not(.active){@include icon(21px, -21px, -42px); } -} -i.icon-materio-viewmode-cardfull{ - @include icon(21px, -42px, -63px); - &.active{@include icon(21px, 0, -63px); } - &:hover:not(.active){@include icon(21px, -21px, -63px); } -} +// i.icon-materio-viewmode-cardsmall{ +// @include icon(20px, -42px, 0); +// &.active{@include icon(21px, 0, 0); } +// &:hover:not(.active){@include icon(21px, -21px, 0); } +// } +// i.icon-materio-viewmode-cardmedium{ +// @include icon(21px, -42px, -21px); +// &.active{@include icon(21px, 0, -21px); } +// &:hover:not(.active){@include icon(21px, -21px, -21px); } +// } +// i.icon-materio-viewmode-cardbig{ +// @include icon(21px, -42px, -42px); +// &.active{@include icon(21px, 0, -42px); } +// &:hover:not(.active){@include icon(21px, -21px, -42px); } +// } +// i.icon-materio-viewmode-cardfull{ +// @include icon(21px, -42px, -63px); +// &.active{@include icon(21px, 0, -63px); } +// &:hover:not(.active){@include icon(21px, -21px, -63px); } +// } -i.icon-materio-search{ - @include icon(21px, -63px, -63px); -} +// i.icon-materio-search{ +// @include icon(21px, -63px, -63px); +// } -i.icon-materio-folder{ - @include icon(21px, -84px, -63px); -} +// i.icon-materio-folder{ +// @include icon(21px, -84px, -63px); +// } /** diff --git a/sites/all/themes/gui/materiobasetheme/scss/styles.scss b/sites/all/themes/gui/materiobasetheme/scss/styles.scss index 8c4b9590..9b3b7726 100644 --- a/sites/all/themes/gui/materiobasetheme/scss/styles.scss +++ b/sites/all/themes/gui/materiobasetheme/scss/styles.scss @@ -346,7 +346,7 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom; @include fs12; i{ vertical-align: text-bottom; - margin: 0 2px 1px 0; + margin: 0 5px 1px 0; } a span.account{text-transform: lowercase;} a span.logout{display:none; @include ml(5px); }