Skip to content
This repository has been archived by the owner on Apr 9, 2024. It is now read-only.

Commit

Permalink
Some layout improvements
Browse files Browse the repository at this point in the history 
Change classes row-fluid by row & span-* by col-*
  • Loading branch information
Raúl Díaz Poblete committed Jan 29, 2016
1 parent 3d0850b commit 1663fa5
Show file tree
Hide file tree
Showing 16 changed files with 90 additions and 167 deletions.
4 changes: 0 additions & 4 deletions app/assets/stylesheets/_admin.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@

.admin #wrapper.full{
margin-top: 40px;

.span12{
padding: 10px 20px 0;
}
}

#login-form{
Expand Down
64 changes: 1 addition & 63 deletions app/assets/stylesheets/_article.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,10 +188,6 @@
@include boxStyle();
}

.posts.span8{
background: #fff;
}

.posts .post{

position: relative;
Expand Down Expand Up @@ -398,70 +394,12 @@

.item{
padding: 0;
margin: 0;

.picture{
margin: 0;
}
}

/*
.item{
float: left;
background: #fff;
width: 100%;
margin-bottom: $grid-gutter-width;
margin-right: 2%;
padding: 0;
-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,.15), 0px 2px 1px rgba(0,0,0,.10), 0px 3px 1px rgba(0,0,0,.05);
-moz-box-shadow: 0px 1px 1px rgba(0,0,0,.15), 0px 2px 1px rgba(0,0,0,.10), 0px 3px 1px rgba(0,0,0,.05);
box-shadow: 0px 1px 1px rgba(0,0,0,.15), 0px 2px 1px rgba(0,0,0,.10), 0px 3px 1px rgba(0,0,0,.05);
a{
-webkit-transition: all 0.3s ease-in-out;
-moz-transition: all 0.3s ease-in-out;
-o-transition: all 0.3s ease-in-out;
-ms-transition: all 0.3s ease-in-out;
transition: all 0.3s ease-in-out;
}
h3{
font-size: 1.25em;
font-family: $fontBaskerville !important;
font-weight: bold !important;
line-height: 1.375em;
padding-left: 3px;
margin: 12px 12px 8px 58px;
min-height: 56px;
border-left: 1px solid $colorLinkGreen;
a{
display: block;
color: $colorGray;
min-height: 56px;
padding-left: 10px;
border-left: 1px solid $colorLinkGreen;
&:hover{
color: $colorLinkGreen;
text-decoration: none;
}
}
}
a.image:hover{
@include opacity( 0.8 );
}
.description{
clear: both;
float: none;
p{
display: none;
}
}
}
*/
}

.post-end-image{
Expand Down
14 changes: 9 additions & 5 deletions app/assets/stylesheets/_entity.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,15 @@
display: inline;
line-height: 40px;
font-size: 1.25em;
}

a:hover {
text-decoration: none;
color: $colorTextGreen;
a{
color: $colorTextGreen;

&:hover {
text-decoration: none;
color: $colorGray;
}
}
}
}

Expand Down Expand Up @@ -227,7 +231,7 @@
&.now .bubble:after{
content: '';
float: right;
width: 3px;
width: 8px;
height: 8px;
border-right: 2px solid $colorHeaderLink;
border-left: 3px solid $colorHeaderLink;
Expand Down
2 changes: 0 additions & 2 deletions app/assets/stylesheets/_home.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@
}
}

.slider.span7.nogutter{ width: 100 - 40.42553191489362%; }

.home-slider-container{
padding: 5px 5px 0;
margin-bottom: 70px;
Expand Down
4 changes: 0 additions & 4 deletions app/assets/stylesheets/_responsive.scss
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,6 @@
padding-left: 30px;
}

#wrapper .sidebar.span4 .related-entities-navigation{
margin: 24px 64px;
}

#viz-container{
height: 490px;
}
Expand Down
30 changes: 14 additions & 16 deletions app/views/devise/passwords/new.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,36 @@
<!-- start: Page Title -->
<div class="row-fluid">
<div id="page-title" class="span12 centered">
<div class="row">
<div id="page-title" class="col-sm-12 centered">
<h2>Forgot your password?</h2>
</div>
</div>
<!-- end: Page Title -->

<!--start: Wrapper-->
<div class="row-fluid">
<div id="wrapper" class="full login-container lr-page span4 offset4">
<div class="row">
<div id="wrapper" class="full login-container lr-page col-sm-4 col-sm-offset-4">

<!-- start: Row -->
<div class="row-fluid">
<div class="row">

<div id="login-form" class="span12">
<div id="login-form" class="col-sm-12">

<div class="page-title-small">
<h3>enter your email</h3>
</div>

<%= form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
<%= devise_error_messages! %>
<%= devise_error_messages! %>
<div class="row-fluid">
<%= f.email_field :email, :autofocus => true, :class => 'span12', :placeholder => 'email' %>
<%= f.email_field :email, :autofocus => true, :class => 'form-control col-sm-12', :placeholder => 'email' %>
<p>&nbsp;</p>
<%= f.submit "Send me reset password instructions", :class => 'btn btn-primary col-sm-12' %>
<p>&nbsp;</p>
<% end %>

<div><%= f.submit "Send me reset password instructions", :class => 'btn span12' %></div>
<% end %>

<div class="links">
<%= render "devise/shared/links" %>
</div>
<div class="links">
<%= render "devise/shared/links" %>
</div>

</div>

</div>
Expand Down
58 changes: 27 additions & 31 deletions app/views/devise/registrations/edit.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,19 @@
<!-- start: Page Title -->
<div class="row-fluid">
<div id="page-title" class="span6 offset3">

<h2>Edit <%= resource_name.to_s.humanize %></h2>

</div>
<div class="row">
<div id="page-title" class="col-sm-12 centered">
<h2>Edit <%= resource_name.to_s.humanize %></h2>
</div>
</div>

<!-- end: Page Title -->

<!--start: Wrapper-->
<div class="row-fluid">
<div id="wrapper" class="lr-page full span6 no-auto-resize offset3">
<div id="wrapper" class="lr-page full col-sm-6 no-auto-resize col-sm-offset-3">

<!-- start: Row -->
<div class="row-fluid">
<div class="row">

<div id="login-form" class="span12">
<div id="login-form" class="col-sm-12">

<div class="page-title-small">

Expand All @@ -26,36 +24,36 @@
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
<%= devise_error_messages! %>

<div style="clear: both;">
<%= f.label :name, :class => 'span4' %>
<%= f.text_field :name, :autofocus => true, :class => 'span8' %>
<div class="form-group">
<%= f.label :name %>
<%= f.text_field :name, :autofocus => true, :class => 'form-control' %>
</div>

<div style="clear: both;">
<%= f.label :name, :class => 'span4' %>
<%= f.email_field :email, :class => 'span8' %>
<div class="form-group">
<%= f.label :name %>
<%= f.email_field :email, :class => 'form-control' %>
</div>

<% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
<div>Currently waiting confirmation for: <%= resource.unconfirmed_email %></div>
<% end %>

<div style="clear: both;">
<%= f.label :password, :class => 'span4' %> <i>(leave blank if you don't want to change it)</i>
<%= f.password_field :password, :class => 'span8', :autocomplete => "off" %>
<div class="form-group">
<%= f.label :password %> <i>(leave blank if you don't want to change it)</i>
<%= f.password_field :password, :class => 'form-control', :autocomplete => "off" %>
</div>

<div style="clear: both;">
<%= f.label :password_confirmation, :class => 'span4' %>
<%= f.password_field :password_confirmation, :class => 'span8' %>
<div class="form-group">
<%= f.label :password_confirmation %>
<%= f.password_field :password_confirmation, :class => 'form-control' %>
</div>

<div style="clear: both;">
<%= f.label :current_password, :class => 'span4' %> <i>(to confirm your changes)</i>
<%= f.password_field :current_password, :class => 'span8' %>
<div class="form-group">
<%= f.label :current_password %> <i>(to confirm your changes)</i>
<%= f.password_field :current_password, :class => 'form-control' %>
</div>

<%= f.submit "Update", :class => 'btn span12' %>
<%= f.submit "Update", :class => 'btn btn-primary col-sm-12' %>
<% end %>

Expand All @@ -65,15 +63,13 @@

</div>

<%= button_to "Unhappy? Cancel your account", registration_path(resource_name), :class => 'btn btn-danger span12', :data => { :confirm => "Are you sure?" }, :method => :delete %>
<%= button_to "Unhappy? Cancel your account", registration_path(resource_name), :class => 'btn btn-danger col-sm-12', :data => { :confirm => "Are you sure?" }, :method => :delete %>
<%= link_to "Back", :back %>

</div>

</div>
<!-- end: Row -->

</div>
<!-- end: Wrapper -->
</div>

<%= link_to "Back", :back %>
35 changes: 16 additions & 19 deletions app/views/devise/registrations/new.html.erb
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<!-- start: Page Title -->
<div class="row-fluid">
<div id="page-title" class="span12 centered">
<h2>Create your account</h2>
</div>
<div class="row">
<div id="page-title" class="col-sm-12 centered">
<h2>Create your account</h2>
</div>
</div>
<!-- end: Page Title -->

<!--start: Wrapper-->
<div class="row-fluid">
<div id="wrapper" class="lr-page full login-container span4 offset4">
<div id="wrapper" class="lr-page full login-container col-sm-4 col-sm-offset-4">

<!-- start: Row -->
<div class="row-fluid">
<div class="row">

<div id="login-form" class="span12">
<div id="login-form" class="col-sm-12">

<div class="page-title-small">

Expand All @@ -35,21 +34,20 @@
<%= form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
<%= devise_error_messages! %>
<div class="row-fluid">
<%= f.text_field :name, :autofocus => true, :placeholder => 'name', :class => 'span12' %>
<%= f.email_field :email, :placeholder => 'email', :class => 'span12' %>
<%= f.password_field :password, :placeholder => 'password', :class => 'span12' %>
<%= f.text_field :name, :autofocus => true, :placeholder => 'name', :class => 'form-control' %>
<%= f.password_field :password_confirmation, :placeholder => 'confirm password', :class => 'span12' %>

</div>
<%= f.email_field :email, :placeholder => 'email', :class => 'form-control' %>
<%= f.password_field :password, :placeholder => 'password', :class => 'form-control' %>
<%= f.password_field :password_confirmation, :placeholder => 'confirm password', :class => 'form-control' %>

<p>&nbsp;</p>

<div class="actions">

<%= f.submit "Create account!", :class => 'btn span12' %>
<%= f.submit "Create account!", :class => 'btn btn-primary' %>

<!-- <%= render "devise/shared/links" %> -->

Expand All @@ -64,4 +62,3 @@

</div>
<!-- end: Wrapper -->
</div>
8 changes: 4 additions & 4 deletions app/views/import/index.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@

<!--start: Wrapper-->
<div id="wrapper" class="full">
<div class="row-fluid">
<div class="span12">
<div class="row">
<div class="col-sm-12">

<h2>Upload new file</h2>
<p>
Expand All @@ -21,8 +21,8 @@

<!--start: Wrapper-->
<div id="wrapper" class="full">
<div class="row-fluid">
<div class="span12">
<div class="row">
<div class="col-sm-12">

<h2>Process database facts</h2>
<p>
Expand Down

0 comments on commit 1663fa5

Please sign in to comment.