Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Páginas informativas #24

Merged
merged 38 commits into from
Oct 25, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
bf032bc
Page model and migration
Oct 25, 2015
7396c96
Add pages controller and views
Oct 25, 2015
d4e0dca
Basic pages views and basic form, rdy to HTML markup
Oct 25, 2015
3fd1f97
Adds seeds
taitus Oct 25, 2015
1c50e48
fix seeds
taitus Oct 25, 2015
6e6658c
Pages index
Oct 25, 2015
598f999
Fix seeds from pages
taitus Oct 25, 2015
2b33d9a
Recursive page level
Oct 25, 2015
05a3449
Fix merge
Oct 25, 2015
5bc5748
add pages and refactor scss
agileontheweb Oct 25, 2015
6edcea1
Add pages helper
Senen Oct 25, 2015
d78a1c7
Add has many relation to Page
Senen Oct 25, 2015
095d515
fix merge
agileontheweb Oct 25, 2015
d163d6f
Merge branch 'informative-pages' of https://github.com/rockandror/tra…
agileontheweb Oct 25, 2015
72d00bc
Edit and New pages
Oct 25, 2015
0498f49
Add pages helper specs. Add factory for pages model.
Senen Oct 25, 2015
ee3f1aa
Merge branch 'informative-pages' of https://github.com/rockandror/tra…
Senen Oct 25, 2015
c805549
Fix merge
Oct 25, 2015
700c4ea
Merge branch 'informative-pages' of https://github.com/rockandror/tra…
Oct 25, 2015
61542a2
Add pages model spec
Senen Oct 25, 2015
cfd5e71
Merge branch 'informative-pages' of https://github.com/rockandror/tra…
Senen Oct 25, 2015
78ebf14
Remove menu
taitus Oct 25, 2015
dc932cb
Merge branch 'informative-pages' of https://github.com/rockandror/tra…
taitus Oct 25, 2015
51970d9
Add pages feature spec
Senen Oct 25, 2015
4e9f039
Merge branch 'informative-pages' of https://github.com/rockandror/tra…
Senen Oct 25, 2015
9df0327
page title helper
taitus Oct 25, 2015
985956f
Merge branch 'informative-pages' of https://github.com/rockandror/tra…
taitus Oct 25, 2015
d9ac44f
fix link
taitus Oct 25, 2015
4090a01
convert init-foundation to coffee - fix sticky_class foundation error…
agileontheweb Oct 25, 2015
a1f4785
pass rspec spec
agileontheweb Oct 25, 2015
e680b71
Fix specs. Adds blank to links
taitus Oct 25, 2015
76035ac
add button back, selected element page, page style
agileontheweb Oct 25, 2015
adc2eb6
change path button back
agileontheweb Oct 25, 2015
ee80d16
Add fourth level. Fix error with page.link
taitus Oct 25, 2015
6b94e50
Merge with styles
taitus Oct 25, 2015
d31e230
add indent four level
agileontheweb Oct 25, 2015
2a10255
Remove js true
taitus Oct 25, 2015
b9ff223
PR prepare
taitus Oct 25, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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