Standardised layout types and cleaned up CSS

master
Zequez 2015-08-06 15:26:09 -03:00
parent 3e9edc1a17
commit 90591dbf8d
34 changed files with 235 additions and 286 deletions

View File

@ -33,15 +33,16 @@
@import "partials/header"
@import "partials/search_bar"
@import "partials/footer"
@import "partials/image_modal"
@import "mods/index"
@import "mods/show"
@import "mods/edit"
@import "mods/mod_form"
@import "mods/mod_card"
@import "bookmarks"
@import "devise"
@import "users"
@import "users/devise"
@import "users/users"
@import "users/identification_form"
@import "forum_validations"
@import "static"
@import "errors"

View File

@ -9,12 +9,6 @@
.mods-bookmark-destroy
display: inline
.bookmarks.index
.content
background: none
border-radius: 0
padding: 0
.bookmarks-tools
@extend %content-block
padding: space()

View File

@ -0,0 +1,8 @@
.forum_validations
&.new
text-align: center
.formtastic
.action
text-align: center
input
float: none

View File

@ -34,16 +34,24 @@ $susy: (gutters: $gutterSize*1.25)
.content
+span(full)
padding: 0
margin-bottom: rhythm()
border-radius: $border-radius
background: $color-white
margin-bottom: rhythm()
padding: space()
+pie-clearfix
code
font-family: monospace
background: rgba(#000, 0.1)
border-radius: 2px
vertical-align: bottom
//.content-wide
.content-slim
+pad(2 2 of 12 no-gutters)
h1
text-align: center
margin: $base-line-height 0
.content-none
background: none
// +clearfix

View File

@ -1,83 +0,0 @@
.mods.edit .content
padding: 0
.mods-edit
@extend %content-block
+span(full)
h2
margin-bottom: $base-line-height
+font-xx-larger
font-weight: bold
text-align: center
.mod
+span(8 of 12 no-gutters wider)
margin-left: span(2 of 12)
.mod-version, #mod_categories_input
select[multiple]
+span(5 omega of 8)
height: $base-line-height*2
padding: 0px
option
float: left
line-height: $base-line-height
border-right: solid 1px $color-gray
border-bottom: solid 1px $color-gray
#mod_categories_input select[multiple]
height: $base-line-height*6
.mod-version>fieldset>legend
font-weight: bold
.mod-version-file
&:first-child
.nested-fields-remove
display: none
li.file
+span(5 of 8 no-gutters wide)
label
+span(3 of 5)
input
+span(2 omega of 5)
border-radius: $border-radius 0 0 $border-radius
border-right: 0
li.string
+span(3 omega of 8)
label
display: none
input
+span(full)
border-radius: 0 $border-radius $border-radius 0
li.url
+span(full)
margin-bottom: 0
#mod_description_input
position: relative
.label
+absolute(0px, false, false, 0px)
.inline-hints
+absolute($base-line-height, false, false, 0px)
textarea
position: relative
z-index: 10
+transition-property(width height)
+transition-duration(0.5s)
textarea:focus
width: span(full)
height: $base-line-height*12
.mod-forum
+span(full)
&-iframe
width: 100%
height: 1600px
display: block

View File

@ -1,16 +1,6 @@
$filter-size: 3
$mods-list-size: 12-$filter-size
.mods.index
.content
background: none
border-radius: none
padding: 0
.query-info-box
+span($mods-list-size omega of 12)
margin-bottom: rhythm()
.filter-bar
@extend %content-block
+span($filter-size of 12)
@ -23,6 +13,7 @@ $mods-list-size: 12-$filter-size
text-align: right
padding: 0 space($font-larger)
line-height: rhythm(2)
font-weight: normal
.version-filter

View File

@ -8,6 +8,9 @@
&:last-child
margin-bottom: 0
h2
font-weight: normal
//-- Thumbnail --//
&-thumbnail
@extend %pretty-border

View File

@ -0,0 +1,80 @@
.mod-form
// @extend %content-block
// +span(full)
// h2
// margin-bottom: $base-line-height
// +font-xx-larger
// font-weight: bold
// text-align: center
// .mod
// +span(8 of 12 no-gutters wider)
// margin-left: span(2 of 12)
.mod-version, #mod_categories_input
select[multiple]
+span(5 omega of 8)
height: $base-line-height*2
padding: 0px
option
float: left
line-height: $base-line-height
border-right: solid 1px $color-gray
border-bottom: solid 1px $color-gray
#mod_categories_input select[multiple]
height: $base-line-height*6
.mod-version>fieldset>legend
font-weight: bold
.mod-version-file
&:first-child
.nested-fields-remove
display: none
li.file
+span(5 of 8 no-gutters wide)
label
+span(3 of 5)
input
+span(2 omega of 5)
border-radius: $border-radius 0 0 $border-radius
border-right: 0
li.string
+span(3 omega of 8)
label
display: none
input
+span(full)
border-radius: 0 $border-radius $border-radius 0
li.url
+span(full)
margin-bottom: 0
#mod_description_input
position: relative
.label
+absolute(0px, false, false, 0px)
.inline-hints
+absolute($base-line-height, false, false, 0px)
textarea
position: relative
z-index: 10
+transition-property(width height)
+transition-duration(0.5s)
textarea:focus
width: span(full)
height: $base-line-height*12
.mod-forum
+span(full)
&-iframe
width: 100%
height: 1600px
display: block

View File

@ -1,6 +1,3 @@
.mods.show .content
padding: 0
.mods-show
.mod
h3

View File

@ -8,11 +8,11 @@
.logo
+span(8 of 12)
padding-left: rhythm(3, $font-xxx-larger)*0.50 // H1 font-size
font-weight: bold
+font-xxx-larger
margin-bottom: 0
+dark-text-shadow
a
color: inherit
.fa-cog
font-size: 0.75em
span

View File

@ -1,80 +0,0 @@
.image-modal
display: none
+fixed(0,0,0,0)
//rgba($color-black, 0.75)
padding: $base-line-height
// background: rgba(green, 0.5)
&-canvas
display: block
width: 100%
height: 100%
overflow: hidden
background: rgba($color-black, 0.5)
&-img
cursor: zoom-in
cursor: -webkit-zoom-in
cursor: -moz-zoom-in
// min-height: 100%
// min-width: 100%
&-arrow
$arrowsWidth: $base-line-height*3
$arrowsHeight: $base-line-height*6
+absolute(50%)
+size($arrowsHeight, $arrowsWidth)
margin-top: -$arrowsHeight/2
background: $color-black
color: $color-white
text-align: center
line-height: $arrowsHeight
font-size: 72px
opacity: 0.5
cursor: pointer
&:hover
opacity: 1
&-next
right: 0
border-radius: $border-radius 0 0 $border-radius
&:after
// content: '\203A' // >
margin-right: -5px
+content-icon('caret-right')
&-prev
left: 0
border-radius: 0 $border-radius $border-radius 0
&:after
// content: '\2039' // <
margin-left: -5px
+content-icon('caret-left')
// &-link
// position: absolute
// left: 50%
// top: 0px
// width: 160px
// margin-left: -80px
// background: $color-black
// color: $color-white
// text-align: center
// line-height: $base-line-height
&-close
+absolute(0, 0)
width: $base-line-height*2
height: $base-line-height*2
border-radius: 0 0 0 $border-radius
background-color: $color-washed-orange
color: $color-white
text-align: center
font-size: 50px
line-height: $base-line-height*2
cursor: pointer
overflow: hidden
&:after
content: '\00D7' // &times;
position: relative
top: -6px

View File

@ -1,9 +1,12 @@
+border-box-sizing
h1
+font-xxx-larger
+font-xx-larger
margin-bottom: $base-line-height
font-weight: bold
h2
+font-larger
font-weight: bold
h3
+font-larger
@ -21,4 +24,20 @@ a
body
font-family: "Titillium Web", sans-serif
color: $color-black
color: $color-black
code
font-family: monospace
background: rgba(#000, 0.1)
border-radius: 2px
vertical-align: bottom
p, ul, ol
margin-bottom: rhythm()
ul.dash-list
li
padding-left: space()
&:before
content: "»"
margin-right: space()

View File

@ -1,4 +1,6 @@
.formtastic
ol, p
margin: 0
// li
.input, .action
min-height: $base-line-height

View File

@ -1,10 +0,0 @@
.static
.content
h2
+font-xx-larger
font-weight: bold
h3
+adjust-leading-to(2)
font-weight: bold
ol
list-style: decimal inside

View File

@ -1,4 +1,4 @@
.users
.devise
.content
+pad(3 3 of 12)
@ -6,4 +6,7 @@
margin-bottom: $base-line-height
+font-xx-larger
font-weight: bold
text-align: center
text-align: center
.devise-links
text-align: right

View File

@ -1,18 +1,5 @@
.devise
.content
+pad(3 3 of 12)
h2
margin-bottom: $base-line-height
+font-xx-larger
font-weight: bold
text-align: center
.devise-links
text-align: right
.identification-form
h2 label
h1 label
cursor: pointer
padding: 0 10px
border-radius: 2px
@ -34,7 +21,7 @@
#identify_login
display: none
&:checked
& ~ h2 label[for="identify_login"]
& ~ h1 label[for="identify_login"]
@extend %checked-label
& ~ #new_session
display: block
@ -44,7 +31,7 @@
#identify_register
display: none
&:checked
& ~ h2 label[for="identify_register"]
& ~ h1 label[for="identify_register"]
@extend %checked-label
& ~ #new_session
display: none

View File

@ -0,0 +1,6 @@
.users .content
h1
margin-bottom: $base-line-height
+font-xx-larger
font-weight: bold
text-align: center

View File

@ -50,7 +50,7 @@ class ApplicationController < ActionController::Base
def configure_devise_permitted_parameters
devise_parameter_sanitizer.for(:sign_up).push(:email, :name)
devise_parameter_sanitizer.for(:sign_in).push(:login)
devise_parameter_sanitizer.for(:account_update)
devise_parameter_sanitizer.for(:account_update) { |u| u.permit :password, :password_confirmation, :current_password }
end
def after_sign_in_path_for(resource)

View File

@ -67,6 +67,13 @@ module ApplicationHelper
@title = page_title_section.to_s + @title
end
def content_layout(type = nil) # :wide / :slim / :none
if type and not [:wide, :slim, :none].include?(type)
raise "#{type} given, :wide, :slim, or :none available"
end
@content_layout ||= type || :slim
end
### Urls helpers:
####################

View File

@ -2,7 +2,8 @@
%h1 Mods by #{@author.name}
Haven't gotten to properly do this page yet, so here is a quick list of mods by this author:
%p
Haven't gotten to properly do this page yet, so here is a quick list of mods by this author:
%ul
- @author.mods.each do |mod|

View File

@ -1,4 +1,5 @@
- title 'Bookmarks'
- content_layout :none
.bookmarks-tools
Here are your bookmarks, modpacks are coming.

View File

@ -1,12 +1,16 @@
- title 'Forum validation'
%h1 Forum account validation
The #{@forum_validation.author.forum_name} forum account has the following mods associated:
%p
The #{@forum_validation.author.forum_name} forum account has the following mods associated:
- @forum_validation.author.mods.each do |mod|
= mod.name
%ul
- @forum_validation.author.mods.each do |mod|
%li= link_to mod.name, mod
= semantic_form_for @forum_validation do |f|
= f.inputs do
= f.input :author_id, as: :hidden
= f.actions do
= f.action :submit
= f.action :submit, data: { disable_with: 'Sending...' }

View File

@ -1,15 +1,20 @@
- title 'Forum validation'
- unless @forum_validation.pm_sent?
= raw I18n.t('forum_validations.show.pm_not_sent')
%h1 Forum account validation
- if @forum_validation.validated?
= t '.validated'
- else
= raw t '.not_validated'
%p
- if @forum_validation.validated?
= t '.validated'
- else
= raw t '.not_validated'
%h2 Mods associated:
- @forum_validation.author.mods.each do |mod|
= link_to mod.name, mod
= link_to '[Edit]', [:edit, mod]
%ul.dash-list
%li
- @forum_validation.author.mods.each do |mod|
= link_to mod.name, mod
= link_to '[Edit]', [:edit, mod] if can?(:edit, mod)

View File

@ -17,7 +17,7 @@
.flash{class: key}
.flash-value= value
.content
.content{class: "content-#{content_layout}"}
= yield
.footer-spacer

View File

@ -0,0 +1,30 @@
.mod-form
= semantic_form_for mod do |f|
= f.inputs do
= f.input :name
= f.input :info_json_name
= f.input :slug if can? :set_slug, mod
= f.input :categories, as: :categories_select
= f.input :owner if can? :set_owner, mod
= f.input :authors_list, as: :multi_datalist, collection: @existing_authors_names, placeholder: @existing_authors_names.sample(4).push('etc').join(', ')
= f.input :github
= f.input :official_url
= f.input :contact
= f.input :forum_url
= f.input :forum_subforum_url
= f.input :imgur
= f.input :summary, as: :text
= f.input :visible if can? :set_visibility, mod
%li.nested-form.mod-versions
= f.semantic_fields_for :versions do |ff|
= render 'version_fields', f: ff
.nested-form-links.mod-versions-links
= link_to_add_association t('.add_version'), f, :versions
// Nested mod versions
// Nested mod files
// Nested mod files
= f.actions do
= f.action :submit
- if @mod.forum_url.present?
.mod-forum
%iframe.mod-forum-iframe{src: @mod.forum_url}

View File

@ -1,4 +1,5 @@
- index_title
- content_layout :none
= render partial: 'filter_bar'

View File

@ -1,32 +1,4 @@
- title @mod.new_record? ? t('.title') : t('.title_edit', name: @mod.name)
.mods-edit
%h1= @mod.decorate.form_title
= semantic_form_for @mod do |f|
= f.inputs do
= f.input :name
= f.input :info_json_name
= f.input :slug if can? :set_slug, @mod
= f.input :categories, as: :categories_select
= f.input :owner if can? :set_owner, @mod
= f.input :authors_list, as: :multi_datalist, collection: @existing_authors_names, placeholder: @existing_authors_names.sample(4).push('etc').join(', ')
= f.input :github
= f.input :official_url
= f.input :contact
= f.input :forum_url
= f.input :forum_subforum_url
= f.input :imgur
= f.input :summary, as: :text
= f.input :visible if can? :set_visibility, @mod
%li.nested-form.mod-versions
= f.semantic_fields_for :versions do |ff|
= render 'version_fields', f: ff
.nested-form-links.mod-versions-links
= link_to_add_association t('.add_version'), f, :versions
// Nested mod versions
// Nested mod files
// Nested mod files
= f.actions do
= f.action :submit
- if @mod.forum_url.present?
.mod-forum
%iframe.mod-forum-iframe{src: @mod.forum_url}
- title @mod.new_record? ? t('.title') : t('.title_edit', name: @mod.name)
%h1= @mod.decorate.form_title
= render partial: 'form', locals: { mod: @mod }

View File

@ -1,13 +1,13 @@
- title t '.title'
:markdown
## How to install mods
# How to install mods
**The current install button is not supported by any mod manager yet, give it time.**
After you download the mod you want, you have the following options:
### Factorio Mod Manager
## Factorio Mod Manager
[Factorio Mods Manager](https://github.com/narrowtux/FactorioModManager) it's a multiplatform Java app created by [narrowtux](https://github.com/narrowtux).
You can find [detailed instructions of how to use it](http://www.factorioforums.com/forum/viewtopic.php?f=69&t=13327)
@ -18,7 +18,7 @@
The Factorio Mod Manager will let you activate and deactivate mods without having to manually add them or remove them from the folder.
### Manually
## Manually
Just copy the mods to `/mods` folder in
the [Factorio application directory](http://www.factorioforums.com/wiki/index.php?title=Application_Directory).

View File

@ -1,7 +1,7 @@
- title t '.title'
:markdown
## How to create mods
# How to create mods
Factorio mods are created in the LUA programming language.
[You can follow the modding tutorial on the Wiki.](http://www.factorioforums.com/wiki/index.php?title=Modding_Tutorial)
@ -9,4 +9,4 @@
After you create the mod, you should publish it to the [official Factorio mods subforum](http://www.factorioforums.com/forum/viewforum.php?f=14&start=0).
And it's encouraged to [release the source on Github](http://github.com/)!
Github also allows you [host zipped releases](https://github.com/blog/1547-release-your-software)!
Github also allows you [host zipped releases](https://github.com/blog/1547-release-your-software)!

View File

@ -1,7 +1,7 @@
- title t '.title'
:markdown
## How to submit mods
# How to submit mods
[Register an account here](#{new_user_registration_path}) and then go to [/mods/new](#{new_mod_path}) to
create a new mod!

View File

@ -2,7 +2,7 @@
= radio_button_tag(:identify, :login, default == :sign_in)
= radio_button_tag(:identify, :register, default == :sign_up)
%h2
%h1
= label_tag(:identify_login, 'Login')
or
= label_tag(:identify_register, 'Register')

View File

@ -1,19 +1,15 @@
- title 'Edit your account'
%h2
%h1
Edit your account
= semantic_form_for(resource, as: resource_name, url: registration_path(resource_name), html: { method: :put }) do |f|
= f.semantic_errors
= f.inputs do
= f.input :email, required: true, autofocus: true
- if devise_mapping.confirmable? && resource.pending_reconfirmation?
%p
Currently waiting confirmation for: #{resource.unconfirmed_email}
= f.input :password, autocomplete: "off", hint: "leave it blank if you don't want to change it", required: false
= f.input :password_confirmation, required: false
= f.input :current_password, hint: "we need your current password to confirm your changes", required: true
= f.actions do
= f.action :submit, label: 'Update'
%h3 Cancel my account
%p
=link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete
-# %h2 Cancel my account
-# %p
-# =link_to "Cancel my account", registration_path(resource_name), data: { confirm: "Are you sure?" }, method: :delete

View File

@ -87,3 +87,7 @@ en:
placeholders:
mod:
authors_list: 'Author1, Author2, Author3, etc'
actions:
forum_validation:
create: Send me a PM

View File

@ -13,6 +13,8 @@ en:
title_edit: Edit %{name} # We use the same view
edit: Edit
new: Create new mod
form:
add_version: Add version
show: