Better styling
This commit is contained in:
@@ -32,7 +32,6 @@ gem 'actionpack-page_caching'
|
||||
|
||||
# jquery-rails is used by the dummy application
|
||||
gem "jquery-rails"
|
||||
gem "jquery-ui-rails"
|
||||
# To use debugger
|
||||
group :test do
|
||||
gem 'steak'
|
||||
|
||||
+30
-33
@@ -22,7 +22,7 @@ GIT
|
||||
|
||||
GIT
|
||||
remote: git://github.com/bterkuile/simply_stored.git
|
||||
revision: 8f00644f7a8e82dba057c01f86dbb8bc3154d5d8
|
||||
revision: 652caf8c2cfe4f828477f8b76d0cd201851cd53d
|
||||
specs:
|
||||
simply_stored (1.0.0)
|
||||
activesupport
|
||||
@@ -81,9 +81,9 @@ GEM
|
||||
thread_safe (~> 0.3, >= 0.3.4)
|
||||
tzinfo (~> 1.1)
|
||||
arel (6.0.0)
|
||||
bcrypt (3.1.9)
|
||||
bourbon (4.1.1)
|
||||
sass (~> 3.3)
|
||||
bcrypt (3.1.10)
|
||||
bourbon (4.2.1)
|
||||
sass (~> 3.4)
|
||||
thor
|
||||
builder (3.2.2)
|
||||
capybara (2.4.4)
|
||||
@@ -100,7 +100,7 @@ GEM
|
||||
coffee-script (2.3.0)
|
||||
coffee-script-source
|
||||
execjs
|
||||
coffee-script-source (1.8.0)
|
||||
coffee-script-source (1.9.1)
|
||||
couchrest (1.2.0)
|
||||
mime-types (~> 1.15)
|
||||
multi_json (~> 1.0)
|
||||
@@ -117,17 +117,17 @@ GEM
|
||||
email_validator (1.5.0)
|
||||
activemodel
|
||||
erubis (2.7.0)
|
||||
eventmachine (1.0.4)
|
||||
execjs (2.2.2)
|
||||
eventmachine (1.0.7)
|
||||
execjs (2.3.0)
|
||||
factory_girl (4.5.0)
|
||||
activesupport (>= 3.0.0)
|
||||
factory_girl_rails (4.5.0)
|
||||
factory_girl (~> 4.5.0)
|
||||
railties (>= 3.0.0)
|
||||
foundation-rails (5.5.0.0)
|
||||
foundation-rails (5.5.1.0)
|
||||
railties (>= 3.1.0)
|
||||
sass (>= 3.2.0, < 3.4)
|
||||
globalid (0.3.0)
|
||||
sass (>= 3.3.0, < 3.5)
|
||||
globalid (0.3.3)
|
||||
activesupport (>= 4.1.0)
|
||||
hike (1.2.3)
|
||||
i18n (0.7.0)
|
||||
@@ -135,8 +135,6 @@ GEM
|
||||
rails-dom-testing (~> 1.0)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
jquery-ui-rails (5.0.3)
|
||||
railties (>= 3.2.16)
|
||||
json (1.8.2)
|
||||
loofah (2.0.1)
|
||||
nokogiri (>= 1.5.9)
|
||||
@@ -158,7 +156,7 @@ GEM
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
pry-rails (0.3.2)
|
||||
pry-rails (0.3.3)
|
||||
pry (>= 0.9.10)
|
||||
rack (1.6.0)
|
||||
rack-test (0.6.3)
|
||||
@@ -189,39 +187,39 @@ GEM
|
||||
thor (>= 0.18.1, < 2.0)
|
||||
rake (10.4.2)
|
||||
rdoc (4.2.0)
|
||||
json (~> 1.4)
|
||||
responders (2.1.0)
|
||||
railties (>= 4.2.0, < 5)
|
||||
rest-client (1.6.8)
|
||||
mime-types (~> 1.16)
|
||||
rdoc (>= 2.4.2)
|
||||
rspec-core (3.1.7)
|
||||
rspec-support (~> 3.1.0)
|
||||
rspec-expectations (3.1.2)
|
||||
rspec-core (3.2.1)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-expectations (3.2.0)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.1.0)
|
||||
rspec-its (1.1.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-its (1.2.0)
|
||||
rspec-core (>= 3.0.0)
|
||||
rspec-expectations (>= 3.0.0)
|
||||
rspec-mocks (3.1.3)
|
||||
rspec-support (~> 3.1.0)
|
||||
rspec-rails (3.1.0)
|
||||
actionpack (>= 3.0)
|
||||
activesupport (>= 3.0)
|
||||
railties (>= 3.0)
|
||||
rspec-core (~> 3.1.0)
|
||||
rspec-expectations (~> 3.1.0)
|
||||
rspec-mocks (~> 3.1.0)
|
||||
rspec-support (~> 3.1.0)
|
||||
rspec-support (3.1.2)
|
||||
sass (3.3.14)
|
||||
rspec-mocks (3.2.1)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-rails (3.2.1)
|
||||
actionpack (>= 3.0, < 4.3)
|
||||
activesupport (>= 3.0, < 4.3)
|
||||
railties (>= 3.0, < 4.3)
|
||||
rspec-core (~> 3.2.0)
|
||||
rspec-expectations (~> 3.2.0)
|
||||
rspec-mocks (~> 3.2.0)
|
||||
rspec-support (~> 3.2.0)
|
||||
rspec-support (3.2.2)
|
||||
sass (3.4.12)
|
||||
sass-rails (5.0.1)
|
||||
railties (>= 4.0.0, < 5.0)
|
||||
sass (~> 3.1)
|
||||
sprockets (>= 2.8, < 4.0)
|
||||
sprockets-rails (>= 2.0, < 4.0)
|
||||
tilt (~> 1.1)
|
||||
slim (3.0.1)
|
||||
slim (3.0.2)
|
||||
temple (~> 0.7.3)
|
||||
tilt (>= 1.3.3, < 2.1)
|
||||
slim-rails (3.0.1)
|
||||
@@ -275,7 +273,6 @@ DEPENDENCIES
|
||||
factory_girl_rails
|
||||
foundation-rails
|
||||
jquery-rails
|
||||
jquery-ui-rails
|
||||
orm_adapter!
|
||||
paperclip
|
||||
pry-rails
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
#= require jquery
|
||||
#= require jquery_ujs
|
||||
#= require jquery-ui
|
||||
#= require foundation
|
||||
#= require tinymce-jquery
|
||||
#= require_directory .
|
||||
|
||||
@@ -3,3 +3,4 @@
|
||||
@import ./foundation_and_overrides
|
||||
@import ./structure
|
||||
@import ./components/*
|
||||
@import ./locale
|
||||
|
||||
+1
-2
@@ -1,5 +1,4 @@
|
||||
@import bourbon
|
||||
|
||||
table.index-table
|
||||
width: 100%
|
||||
td.action
|
||||
width: 24px
|
||||
@@ -1,26 +0,0 @@
|
||||
@import bourbon
|
||||
#menu-container
|
||||
@include linear-gradient(#1e5799, #2989d8)
|
||||
clear: both
|
||||
padding: 10px
|
||||
ul
|
||||
margin: 0
|
||||
padding: 0
|
||||
list-style: none
|
||||
li
|
||||
float: left
|
||||
margin-right: 9px
|
||||
padding: 5px 4px
|
||||
background-color: white
|
||||
&.parent:hover> ul
|
||||
display: block
|
||||
.child-menu
|
||||
display: none
|
||||
position: absolute
|
||||
z-index: 10000
|
||||
margin-left: -5px
|
||||
margin-top: 4px
|
||||
li
|
||||
float: none
|
||||
&.ui-state-active .child-menu li.ui-state-default a
|
||||
color: #1C94C4
|
||||
@@ -8,8 +8,6 @@ table.index-table.table.table-striped.table-hover
|
||||
th= Page.human_attribute_name(:has_view)
|
||||
th= Page.human_attribute_name(:in_menu)
|
||||
th= Page.human_attribute_name(:position)
|
||||
th
|
||||
th
|
||||
tbody
|
||||
- Page.locales.each do |locale|
|
||||
= render 'nested_pages', pages: Page.full_tree(locale)
|
||||
|
||||
Reference in New Issue
Block a user