Skip to content

Commit

Permalink
Merge pull request #24 from rockandror/informative-pages
Browse files Browse the repository at this point in the history
Páginas informativas
  • Loading branch information
voodoorai2000 committed Oct 25, 2015
2 parents 9598068 + b9ff223 commit 5f54875
Show file tree
Hide file tree
Showing 32 changed files with 619 additions and 141 deletions.
3 changes: 0 additions & 3 deletions app/assets/javascripts/init-foundation.js

This file was deleted.

5 changes: 5 additions & 0 deletions app/assets/javascripts/init-foundation.js.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
$(document).on 'ready page:load', ->
$ ->
$(document).foundation()
return
return
2 changes: 2 additions & 0 deletions app/assets/stylesheets/application.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
@import "fonts";
@import "icons";
@import "layout";
@import "common-class";
@import "program-accomplishment";
@import "pages";
@import "trix";
@import "objectives";
@import "enquiries";
134 changes: 134 additions & 0 deletions app/assets/stylesheets/common-class.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,134 @@
// Table Contents
// 01. Column Left
// 02. Column Center
// 03. Column Right
// 04. Area Link
// 05. Text helper classes

.columns{
h2{
line-height: 0.8em;
small{font-size: 50%;}
}
}

// 01. Column Left
// - - - - - - - - - - - - - - - - - - - - - - - - -
.column_left{
strong{
padding: 10px;
margin-top: 1.2em;
display: block;
}
a{
span{
display: inline-block;
margin-right: 20px;
}
}
}

// 02. Column center
// - - - - - - - - - - - - - - - - - - - - - - - - -
.column_center{
.columns{
h2{line-height: 0.8em;}
}

a{
span{
font-size: 0.8em;
color:$text;
display: block;
margin-right: 20px;
}
}
}

// 03. Column right
// - - - - - - - - - - - - - - - - - - - - - - - - -
.column_right{
h4{font-size: 1em;}
.made{
h4{color:green;}
li{
i{color:green;}
}
}
.pending{
h4{color:$alert-color;}
li{
i{color:$alert-color;}
}
}
}
.description{
&.small{
height: 60px;
overflow: hidden;
}
.show-more {
position:relative;
cursor: pointer;
border:1px solid transparent;
display: inline-block;
color:$link;
margin-top:5px;
padding: 5px;
&:hover{
border:1px solid $link;
}
}
}

// 04. Area Link
// - - - - - - - - - - - - - - - - - - - - - - - - -
.area_link{
a{
padding-left: 40px;
position: relative;
display: block;
position: relative;
margin-bottom: 10px;
padding: 11px;
line-height: 1.1em;
border:1px solid transparent;
&:hover{ border:1px solid $link; }
&.active{
border:1px solid $link;
color: darken($text, 20%);
i{
background: lighten($link, 30%);
&:before{
-ms-transform: rotate(90deg);
-webkit-transform: rotate(90deg);
transform: rotate(90deg);
top:45%;
left:2%;
}
}
}
i{
position: absolute;
right: 0;
top: 0;
bottom: 0;
width: 2em;
&:before{
right:0;
left: 6px;
position: absolute;
top: 37%;
}
}
&.active{
border:1px solid $link;
color: darken($text, 20%);
}
}
}

// 05. Text helper classes
// - - - - - - - - - - - - - - - - - - - - - - - - -
.text-success{color:$success-color;}
.text-danger{color:$alert-color;}
39 changes: 39 additions & 0 deletions app/assets/stylesheets/pages.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
.pages{
@extend .column;
@extend .column_left;
@extend .column_center;
@extend .column_right;
.column_right{
.indent{padding-left: 20px;}
.four_level{
padding-left: 30px;
}
}
.column_left, .column_center,.column_right{
@extend .area_link;
}
.area_link{
span{
padding-left: 20px;
font-size: 1.2em;
color:$link;
}
.description{
font-size: 0.8em;
color:$text;
}
.icon-edit{
display: inline-block;
position: absolute;
z-index: 2;
border: none;
&:hover{
border: none;
color: $link-hover;
}
}
}
}
.show{
text-align: justify;
}
132 changes: 8 additions & 124 deletions app/assets/stylesheets/program-accomplishment.scss
Original file line number Diff line number Diff line change
@@ -1,127 +1,11 @@
// Table of Contents
//
// 00. Color
// 01. Column Left
// 02. Column Center
// 03. Column Right
// 04. Common class
.program-accomplishment{
//From common-class.scss
@extend .column;
@extend .column_left;
@extend .column_center;
@extend .column_right;

// 00. Color
// - - - - - - - - - - - - - - - - - - - - - - - - -
.text-success{color:$success-color;}
.text-danger{color:$alert-color;}

.program-accomplishment{
// 01. Column Left
// - - - - - - - - - - - - - - - - - - - - - - - - -
.column_left{
strong{
padding: 10px;
margin-top: 1.2em;
display: block;
}
a{
span{
display: inline-block;
margin-right: 20px;
}
}
}

// 02. Column center
// - - - - - - - - - - - - - - - - - - - - - - - - -
.column_center{
h2{
line-height: 0.8em;
}
a{
span{
font-size: 0.8em;
color:$text;
display: block;
margin-right: 20px;
}
}
}

// 03. Column right
// - - - - - - - - - - - - - - - - - - - - - - - - -
.column_right{
h4{font-size: 1em;}
.made{
h4{color:green;}
li{
i{color:green;}
}
}
.pending{
h4{color:$alert-color;}
li{
i{color:$alert-color;}
}
}
}
.description{
&.small{
height: 60px;
overflow: hidden;
}
.show-more {
position:relative;
cursor: pointer;
border:1px solid transparent;
display: inline-block;
color:$link;
margin-top:5px;
padding: 5px;
&:hover{
border:1px solid $link;
}
}
}

// 04. Same class
// - - - - - - - - - - - - - - - - - - - - - - - - -
.column_left, .column_center{
a{
display: block;
position: relative;
margin-bottom: 10px;
padding: 11px;
line-height: 1.1em;
border:1px solid transparent;
&:hover{ border:1px solid $link; }
&.active{
border:1px solid $link;
color: darken($text, 20%);
i{
background: lighten($link, 30%);
&:before{
-ms-transform: rotate(90deg);
-webkit-transform: rotate(90deg);
transform: rotate(90deg);
top:45%;
left:2%;
}
}
}
i{
position: absolute;
right: 0;
top: 0;
bottom: 0;
width: 2em;
&:before{
right:0;
left: 6px;
position: absolute;
top: 37%;
}
}
&.active{
border:1px solid $link;
color: darken($text, 20%);
}
}
@extend .area_link;
}
}
}
Loading

0 comments on commit 5f54875

Please sign in to comment.