a little styling
This commit is contained in:
parent
1ba40c965d
commit
708938ff45
1
Gemfile
1
Gemfile
@ -9,6 +9,7 @@ gem 'font-awesome-rails'
|
|||||||
gem 'jbuilder', '~> 2.6'
|
gem 'jbuilder', '~> 2.6'
|
||||||
gem 'jquery-rails'
|
gem 'jquery-rails'
|
||||||
gem 'json', '~> 2.0.2'
|
gem 'json', '~> 2.0.2'
|
||||||
|
gem 'normalize-rails'
|
||||||
gem 'puma', '~> 3.0'
|
gem 'puma', '~> 3.0'
|
||||||
gem 'sass-rails', '~> 5.0'
|
gem 'sass-rails', '~> 5.0'
|
||||||
gem 'settingslogic', '~> 2.0.9'
|
gem 'settingslogic', '~> 2.0.9'
|
||||||
|
@ -126,6 +126,7 @@ GEM
|
|||||||
nokogiri (1.6.8)
|
nokogiri (1.6.8)
|
||||||
mini_portile2 (~> 2.1.0)
|
mini_portile2 (~> 2.1.0)
|
||||||
pkg-config (~> 1.1.7)
|
pkg-config (~> 1.1.7)
|
||||||
|
normalize-rails (4.1.1)
|
||||||
notiffany (0.1.1)
|
notiffany (0.1.1)
|
||||||
nenv (~> 0.1)
|
nenv (~> 0.1)
|
||||||
shellany (~> 0.0)
|
shellany (~> 0.0)
|
||||||
@ -251,6 +252,7 @@ DEPENDENCIES
|
|||||||
listen (~> 3.0)
|
listen (~> 3.0)
|
||||||
minitest-reporters
|
minitest-reporters
|
||||||
mysql2 (>= 0.3.18, < 0.5)
|
mysql2 (>= 0.3.18, < 0.5)
|
||||||
|
normalize-rails
|
||||||
pry-byebug
|
pry-byebug
|
||||||
pry-rails
|
pry-rails
|
||||||
puma (~> 3.0)
|
puma (~> 3.0)
|
||||||
|
26
Guardfile
26
Guardfile
@ -1,16 +1,16 @@
|
|||||||
# guard 'livereload' do
|
guard 'livereload' do
|
||||||
# watch(%r{app/assets/.+\.(scss|css|js|erb)})
|
watch(%r{app/assets/.+\.(scss|css|js|erb)})
|
||||||
# watch(%r{app/views/.+\.(erb|haml|slim)$})
|
watch(%r{app/views/.+\.(erb|haml|slim)$})
|
||||||
# watch(%r{app/controllers/.+\.rb})
|
watch(%r{app/controllers/.+\.rb})
|
||||||
# watch(%r{app/helpers/.+\.rb})
|
watch(%r{app/helpers/.+\.rb})
|
||||||
# watch(%r{public/.+\.(css|js|html)})
|
watch(%r{public/.+\.(css|js|html)})
|
||||||
# watch(%r{config/locales/.+\.yml})
|
watch(%r{config/locales/.+\.yml})
|
||||||
#
|
|
||||||
# # Rails Assets Pipeline
|
# Rails Assets Pipeline
|
||||||
# watch(%r{(app|vendor)(/assets/\w+/(.+\.(scss|css|js|erb|html|png|jpg))).*}) do |m|
|
watch(%r{(app|vendor)(/assets/\w+/(.+\.(scss|css|js|erb|html|png|jpg))).*}) do |m|
|
||||||
# "/assets/#{m[3]}"
|
"/assets/#{m[3]}"
|
||||||
# end
|
end
|
||||||
# end
|
end
|
||||||
|
|
||||||
guard :minitest, spring: true, all_after_pass: true do
|
guard :minitest, spring: true, all_after_pass: true do
|
||||||
watch(%r{^test/test_helper\.rb$}) { 'test' }
|
watch(%r{^test/test_helper\.rb$}) { 'test' }
|
||||||
|
@ -13,4 +13,5 @@
|
|||||||
//= require jquery
|
//= require jquery
|
||||||
//= require jquery_ujs
|
//= require jquery_ujs
|
||||||
//= require turbolinks
|
//= require turbolinks
|
||||||
//= require main
|
//
|
||||||
|
//= require passwords
|
||||||
|
@ -10,34 +10,16 @@
|
|||||||
* files in this directory. Styles in this file should be added after the last require_* statement.
|
* files in this directory. Styles in this file should be added after the last require_* statement.
|
||||||
* It is generally better to create a new file per style scope.
|
* It is generally better to create a new file per style scope.
|
||||||
*
|
*
|
||||||
|
*= require normalize-rails
|
||||||
*= require font-awesome
|
*= require font-awesome
|
||||||
*= require_tree .
|
|
||||||
*= require_self
|
*= require_self
|
||||||
*/
|
*/
|
||||||
|
|
||||||
table {
|
@import 'atoms/variables';
|
||||||
width: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
th {
|
@import 'atoms/base';
|
||||||
text-align: left;
|
|
||||||
}
|
|
||||||
|
|
||||||
td {
|
@import 'molecules/passwords';
|
||||||
padding: 5px 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
.field {
|
@import 'organisms/tables';
|
||||||
margin: 5px 0;
|
@import 'organisms/forms';
|
||||||
}
|
|
||||||
|
|
||||||
td.passwd {
|
|
||||||
width: 20em;
|
|
||||||
}
|
|
||||||
|
|
||||||
.passwd a,
|
|
||||||
.passwd i {
|
|
||||||
color: #000;
|
|
||||||
cursor: pointer;
|
|
||||||
text-decoration: none;
|
|
||||||
}
|
|
4
app/assets/stylesheets/atoms/_base.scss
Normal file
4
app/assets/stylesheets/atoms/_base.scss
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
body {
|
||||||
|
margin: 20px auto;
|
||||||
|
width: 850px;
|
||||||
|
}
|
6
app/assets/stylesheets/atoms/_variables.scss
Normal file
6
app/assets/stylesheets/atoms/_variables.scss
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
$copy: #000;
|
||||||
|
|
||||||
|
// gutters
|
||||||
|
$gutter: 30px;
|
||||||
|
$half-gutter: 15px;
|
||||||
|
$mini-gutter: 5px;
|
10
app/assets/stylesheets/molecules/_passwords.scss
Normal file
10
app/assets/stylesheets/molecules/_passwords.scss
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
.passwd {
|
||||||
|
width: 20em;
|
||||||
|
|
||||||
|
a,
|
||||||
|
i {
|
||||||
|
color: $copy;
|
||||||
|
cursor: pointer;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
}
|
21
app/assets/stylesheets/organisms/_forms.scss
Normal file
21
app/assets/stylesheets/organisms/_forms.scss
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
label {
|
||||||
|
display: block;
|
||||||
|
font-weight: 600;
|
||||||
|
margin: $half-gutter 0 $mini-gutter;
|
||||||
|
}
|
||||||
|
|
||||||
|
.field {
|
||||||
|
margin: $mini-gutter 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
input:not([type]),
|
||||||
|
[type=text],
|
||||||
|
[type=password],
|
||||||
|
[type=email] {
|
||||||
|
padding: $mini-gutter;
|
||||||
|
}
|
||||||
|
|
||||||
|
[type=submit] {
|
||||||
|
margin: $half-gutter 0;
|
||||||
|
padding: $half-gutter;
|
||||||
|
}
|
11
app/assets/stylesheets/organisms/_tables.scss
Normal file
11
app/assets/stylesheets/organisms/_tables.scss
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
table {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
th {
|
||||||
|
text-align: left;
|
||||||
|
}
|
||||||
|
|
||||||
|
td {
|
||||||
|
padding: 5px 0;
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user