bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed gruntfile, fixed modal buttons, fixed .gitignore .sass-cache folder

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2015-05-18 16:32:24 +02:00
parent 922a2da1e5
commit f28719a994
12 changed files with 3012 additions and 9965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
sites/all/themes/gui/materiobasetheme/scss/styles.scss
View File

@@ -2,10 +2,28 @@
* Primary Drupal Styles
* Author: g-u-i.net
*/
@charset "UTF-8";
@import "../bower_components/foundation/scss/foundation.scss";
@import "../bower_components/foundation/scss/normalize.scss";
@import "../bower_components/foundation/scss/foundation/functions";
// $row-width: rem-calc(1250);
// $total-columns: 12;
// $column-gutter: rem-calc(20);
//@import "../bower_components/foundation/scss/foundation/settings"; // this is not working, causing an error on compilation
@import "../bower_components/foundation/scss/foundation/components/global";
@import "../bower_components/foundation/scss/foundation/components/type";
@import "../bower_components/foundation/scss/foundation/components/clearing";
@import "../bower_components/foundation/scss/foundation/components/inline-lists";
@import "../bower_components/foundation/scss/foundation/components/buttons";
@import "../bower_components/foundation/scss/foundation/components/button-groups";
// @import "../bower_components/foundation/scss/foundation/components/grid";
// @import "../bower_components/foundation/scss/foundation/components/top-bar";
// @import "../bower_components/foundation/scss/foundation/components/block-grid";
@import "gui.scss";
@import "fonts.scss";
@@ -141,7 +159,7 @@
.column-switcher{
display:inline-block; @include rounded(3px); color:#fff; background-color: #3e3e3e; vertical-align:middle;
@include fs700(); @include fs22;
padding: 0.05em 0.15em 0.2em 0.2em; line-height:0.5;
padding: 0.05em 0.15em 0.2em 0.2em; line-height:0.5;
@include regular;
&.prev-column{cursor: w-resize;}
&.next-column{cursor: e-resize;}
@@ -188,14 +206,14 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
//width:210px; //padding-left:5px; //margin-left:50px;
@include inlineblock();
h1{
margin:0;
@include fs36;
margin:0;
@include fs36;
@include inlineblock(); vertical-align: baseline; position:relative; line-height:1.25;
a:hover{text-decoration: none ;}
}
span.beta{
line-height:1; letter-spacing: 0.1em;
color:rgb(0,0,122);
color:rgb(0,0,122);
@include fs12;
position:absolute; left:0; @include pl(0); @include ml(0);
}
@@ -227,10 +245,10 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
.block{
@include inlineblock(); vertical-align:middle;
h2{
@include fs12;
@include fs12;
margin: 0; line-height: 1.2; font-weight: normal; }
&:not(:last-child){
@include pr(0.8em);
@include pr(0.8em);
@media #{$xlarge-only}{ @include pr(0.3em); } //change this
}
}
@@ -262,12 +280,12 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
#edit-actions{
margin: 5px 0; padding: 0; @include bgc(transparent); text-align: right;
input.form-submit{
@include fs12;
@include fs12;
padding: 10px;
}
}
div.newpass a{
@include fs12;
@include fs12;
color:#686868;
}
@@ -293,8 +311,8 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
#block-materio-flag-materio-flag-mylists-nav{
position:relative;
h2{
margin: 0;
@include fs12;
margin: 0;
@include fs12;
line-height:1.1;}// @include fs700;
// h2, section.mylists{@include inlineblock();}
section.mylists{
@@ -303,7 +321,7 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
.ie8 &{background:#FFF;}
ul{margin: 0;}
li{
list-style: none;
list-style: none;
@include fs12; @include fs700;
padding: 0 10px; text-align: left; width:200px;
height:0; overflow:hidden; @include transition-simply-prefix(height 0.3s ease-out);
@@ -312,7 +330,7 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
a, span.preview{white-space:nowrap; cursor:pointer;}
a.open-list{max-width:150px;}
span.count{
@include fs300;
@include fs300;
padding: 0 5px;}
span.preview, a.edit-list{@include pr(5px);}
@@ -338,7 +356,7 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
}
#block-ajax-register-ajax-register-block{
@include fs12;
@include fs12;
text-transform: lowercase;
}
@@ -353,7 +371,7 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
.fi-power{margin: 0 0.5em 0 0.5em;}
@media #{$large-only}{ .fi-power{display: none;} }
@media #{$medium-up}{ a span.logout{display:none;} }
@media #{$small-only}{a span.account{display:none;}} //change this
}
@@ -368,8 +386,8 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
@include ml(1em);
// border-left: 1px solid #707070;
ul,li{
margin:0;padding:0;list-style-type: none;
@include fs12;
margin:0;padding:0;list-style-type: none;
@include fs12;
line-height: 1;
&.active{display:none;}
}
@@ -406,7 +424,7 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
}
ul.menu, li{
@include fs12;
@include fs12;
list-style: none;
.ie8 &{display: inline;}
}
@@ -427,7 +445,7 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
.menu-wrapper{
position:absolute; width:150px; display:none; right:0; @include pt(5px);
ul.menu{
background-color: #e6e6e6;
background-color: #e6e6e6;
@include rounded(5px); padding: 0 5px 5px 5px; margin: 0; text-align: right;
li{
height:0;
@@ -548,16 +566,16 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
.block-materio-didactique{
// .ie8 &{max-width:850px; border: 1px solid #C6C6C6;}
.node-didactique{
@include fs14;
@include fs14;
@include bgc(#fff); //padding: 5px;
margin: 0 auto;
// .ie8 &{max-width:750px; margin-left:15px; margin-top:10px;}
.side{position:relative;}
.field-name-title-field{
@include fs900;
@include italic;
.field-name-title-field{
@include fs900;
@include italic;
padding:5px 0;
}
.field-name-field-visuel{
@@ -869,8 +887,8 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
// position:absolute; top:10px; right:0;
float:right;
>.inner{
@include inlineblock(); margin:0 0 0 10px;
padding: 3px 10px; @include bgc(#fff); @include rounded(3px);
@include inlineblock(); margin:0 0 0 10px;
padding: 3px 10px; @include bgc(#fff); @include rounded(3px);
@include shadowBtn(); text-align: right;
}
}
@@ -1496,10 +1514,19 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull{
.form-actions{ text-align: right ;}
input.form-submit{
@include button;
//@include btn-mini; color:#000; //change this btn bootstrap -> foundation
@include button($button-tny);
//@include btn-mini; color:#000; //change this btn bootstrap -> foundation
&[name="create"]{
// @include btn-info; change this
@include button($button-tny, $success-color);
}
&[name="save"]{
@include button($button-tny, $success-color);
}
&[name="delete"]{
@include button($button-tny, $alert-color);
}
&[name="cancel"]{
@include button($button-tny, $secondary-color);
}
}
}
@@ -1633,7 +1660,7 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull{
@include drop-shadow(0, 0, 5px, 0.4);
&.op-visible{
@include transition-simply-prefix(opacity 0.1s ease-out); // top 0.1s linear); // left 0.1s linear,
// change this transition foundation
// change this transition foundation
}
}
@@ -1763,7 +1790,7 @@ article.node-materiau.vm-cardfull, article.node-breve.vm-cardfull{
margin: 0; text-align:right; padding: 1em 0.5em;
}
// input#edit-submit{@include btn; @include btn-success;} //change this btn foundation
// input#edit-submit{@include btn; @include btn-success;} //change this btn foundation
/* #user-profile-form */
#edit-profile-adherent-field-first-name, #edit-profile-adherent-field-name,
@@ -1872,7 +1899,7 @@ body.page-node-11187{
max-width: 98%;
}
}
}
}
#block-materio-user-user-register{
width:600px; margin: 0 auto;
@@ -2440,4 +2467,4 @@ body.page-node-11187{
max-width:50%;
height:auto;
}
}
}