Skip to content

Commit

Permalink
basically working
Browse files Browse the repository at this point in the history
  • Loading branch information
@leifg
leifg committed Oct 4, 2013
1 parent a9dfd1e commit cd82a3c
Show file tree
Hide file tree
Showing 11 changed files with 2,303 additions and 1,166 deletions.
2 changes: 1 addition & 1 deletion Gemfile
View file
Expand Up @@ -10,7 +10,7 @@ gem 'haml-rails', github: 'indirect/haml-rails' # use rubygems version for >0.4

gem 'symbolize'

gem 'bootstrap-sass'
gem 'bootstrap3-rails'

gem 'haml'

Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Expand Up @@ -44,8 +44,8 @@ GEM
tzinfo (~> 0.3.37)
arel (4.0.0)
atomic (1.1.14)
bootstrap-sass (2.3.2.2)
sass (~> 3.2)
bootstrap3-rails (3.0.1)
rails (~> 4.0.0)
bson (1.9.2)
bson_ext (1.9.2)
bson (~> 1.9.2)
Expand Down Expand Up @@ -225,7 +225,7 @@ PLATFORMS
ruby

DEPENDENCIES
bootstrap-sass
bootstrap3-rails
bson_ext
coveralls
database_cleaner
Expand Down
Empty file modified app/assets/images/clear.png 100644 → 100755
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Empty file modified app/assets/images/loading.gif 100644 → 100755
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3,083 changes: 2,023 additions & 1,060 deletions app/assets/javascripts/bootstrap-editable.js
View file

Large diffs are not rendered by default.

203 changes: 189 additions & 14 deletions app/assets/stylesheets/bootstrap-editable.css.scss
View file
@@ -1,8 +1,7 @@
/*! X-editable - v1.4.3
/*! X-editable - v1.5.0
* In-place editing with Twitter Bootstrap, jQuery UI or pure jQuery
* http://github.com/vitalets/x-editable
* Copyright (c) 2013 Vitaliy Potapov; Licensed MIT */

.editableform {
margin-bottom: 0; /* overwrites bootstrap margin */
}
Expand All @@ -22,7 +21,11 @@
*display: inline;
}


.editable-buttons.editable-buttons-bottom {
display: block;
margin-top: 7px;
margin-left: 0;
}

.editable-input {
vertical-align: top;
Expand Down Expand Up @@ -71,12 +74,20 @@
color: red;
}

/* ---- For specific types ---- */

.editableform .editable-date {
padding: 0;
margin: 0;
float: left;
}

/* move datepicker icon to center of add-on button. See https://github.com/vitalets/x-editable/issues/183 */
.editable-inline .add-on .icon-th {
margin-top: 3px;
margin-left: 1px;
}


/* checklist vertical alignment */
.editable-checklist label input[type="checkbox"],
Expand Down Expand Up @@ -105,25 +116,32 @@

/* IOS-style clear button for text inputs */
.editable-clear-x {
background: image-path("clear.png") center center no-repeat;
background: url('../img/clear.png') center center no-repeat;
display: block;
width: 13px;
height: 13px;
position: absolute;
opacity: 0.6;
z-index: 100;


top: 50%;
right: 6px;
margin-top: -6px;

}

.editable-clear-x:hover {
opacity: 1;
}
.editable-container {

.editable-pre-wrapped {
white-space: pre-wrap;
}
.editable-container.editable-popup {
max-width: none !important; /* without this rule poshytip/tooltip does not stretch */
}

.editable-container.popover {
/* width: 300px;*/ /* debug */
width: auto; /* without this rule popover does not stretch */
}

Expand All @@ -138,6 +156,7 @@

.editable-container.ui-widget {
font-size: inherit; /* jqueryui widget font 1.1em too big, overwrite it */
z-index: 9990; /* should be less than select2 dropdown z-index to close dropdown first when click */
}
.editable-click,
a.editable-click,
Expand All @@ -154,10 +173,10 @@ a.editable-click.editable-disabled:hover {
border-bottom: none;
}

.editable-empty, .editable-empty:hover{
.editable-empty, .editable-empty:hover, .editable-empty:focus{
font-style: italic;
color: #DD1144;
border-bottom: none;
/* border-bottom: none; */
text-decoration: none;
}

Expand All @@ -169,6 +188,14 @@ a.editable-click.editable-disabled:hover {
/* content: '*'*/
}

.editable-bg-transition {
-webkit-transition: background-color 1400ms ease-out;
-moz-transition: background-color 1400ms ease-out;
-o-transition: background-color 1400ms ease-out;
-ms-transition: background-color 1400ms ease-out;
transition: background-color 1400ms ease-out;
}

/*see https://github.com/vitalets/x-editable/issues/139 */
.form-horizontal .editable
{
Expand All @@ -188,7 +215,6 @@ a.editable-click.editable-disabled:hover {
*/
.datepicker {
padding: 4px;
margin-top: 1px;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
Expand Down Expand Up @@ -291,6 +317,7 @@ a.editable-click.editable-disabled:hover {
border-color: #fdf59a #fdf59a #fbed50;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
color: #000;
}
.datepicker table tr td.today:hover,
.datepicker table tr td.today:hover:hover,
Expand Down Expand Up @@ -324,6 +351,124 @@ a.editable-click.editable-disabled:hover {
.datepicker table tr td.today.disabled:hover.active {
background-color: #fbf069 \9;
}
.datepicker table tr td.today:hover:hover {
color: #000;
}
.datepicker table tr td.today.active:hover {
color: #fff;
}
.datepicker table tr td.range,
.datepicker table tr td.range:hover,
.datepicker table tr td.range.disabled,
.datepicker table tr td.range.disabled:hover {
background: #eeeeee;
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.datepicker table tr td.range.today,
.datepicker table tr td.range.today:hover,
.datepicker table tr td.range.today.disabled,
.datepicker table tr td.range.today.disabled:hover {
background-color: #f3d17a;
background-image: -moz-linear-gradient(top, #f3c17a, #f3e97a);
background-image: -ms-linear-gradient(top, #f3c17a, #f3e97a);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#f3c17a), to(#f3e97a));
background-image: -webkit-linear-gradient(top, #f3c17a, #f3e97a);
background-image: -o-linear-gradient(top, #f3c17a, #f3e97a);
background-image: linear-gradient(top, #f3c17a, #f3e97a);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3c17a', endColorstr='#f3e97a', GradientType=0);
border-color: #f3e97a #f3e97a #edde34;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-webkit-border-radius: 0;
-moz-border-radius: 0;
border-radius: 0;
}
.datepicker table tr td.range.today:hover,
.datepicker table tr td.range.today:hover:hover,
.datepicker table tr td.range.today.disabled:hover,
.datepicker table tr td.range.today.disabled:hover:hover,
.datepicker table tr td.range.today:active,
.datepicker table tr td.range.today:hover:active,
.datepicker table tr td.range.today.disabled:active,
.datepicker table tr td.range.today.disabled:hover:active,
.datepicker table tr td.range.today.active,
.datepicker table tr td.range.today:hover.active,
.datepicker table tr td.range.today.disabled.active,
.datepicker table tr td.range.today.disabled:hover.active,
.datepicker table tr td.range.today.disabled,
.datepicker table tr td.range.today:hover.disabled,
.datepicker table tr td.range.today.disabled.disabled,
.datepicker table tr td.range.today.disabled:hover.disabled,
.datepicker table tr td.range.today[disabled],
.datepicker table tr td.range.today:hover[disabled],
.datepicker table tr td.range.today.disabled[disabled],
.datepicker table tr td.range.today.disabled:hover[disabled] {
background-color: #f3e97a;
}
.datepicker table tr td.range.today:active,
.datepicker table tr td.range.today:hover:active,
.datepicker table tr td.range.today.disabled:active,
.datepicker table tr td.range.today.disabled:hover:active,
.datepicker table tr td.range.today.active,
.datepicker table tr td.range.today:hover.active,
.datepicker table tr td.range.today.disabled.active,
.datepicker table tr td.range.today.disabled:hover.active {
background-color: #efe24b \9;
}
.datepicker table tr td.selected,
.datepicker table tr td.selected:hover,
.datepicker table tr td.selected.disabled,
.datepicker table tr td.selected.disabled:hover {
background-color: #9e9e9e;
background-image: -moz-linear-gradient(top, #b3b3b3, #808080);
background-image: -ms-linear-gradient(top, #b3b3b3, #808080);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b3b3b3), to(#808080));
background-image: -webkit-linear-gradient(top, #b3b3b3, #808080);
background-image: -o-linear-gradient(top, #b3b3b3, #808080);
background-image: linear-gradient(top, #b3b3b3, #808080);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#b3b3b3', endColorstr='#808080', GradientType=0);
border-color: #808080 #808080 #595959;
border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
color: #fff;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
}
.datepicker table tr td.selected:hover,
.datepicker table tr td.selected:hover:hover,
.datepicker table tr td.selected.disabled:hover,
.datepicker table tr td.selected.disabled:hover:hover,
.datepicker table tr td.selected:active,
.datepicker table tr td.selected:hover:active,
.datepicker table tr td.selected.disabled:active,
.datepicker table tr td.selected.disabled:hover:active,
.datepicker table tr td.selected.active,
.datepicker table tr td.selected:hover.active,
.datepicker table tr td.selected.disabled.active,
.datepicker table tr td.selected.disabled:hover.active,
.datepicker table tr td.selected.disabled,
.datepicker table tr td.selected:hover.disabled,
.datepicker table tr td.selected.disabled.disabled,
.datepicker table tr td.selected.disabled:hover.disabled,
.datepicker table tr td.selected[disabled],
.datepicker table tr td.selected:hover[disabled],
.datepicker table tr td.selected.disabled[disabled],
.datepicker table tr td.selected.disabled:hover[disabled] {
background-color: #808080;
}
.datepicker table tr td.selected:active,
.datepicker table tr td.selected:hover:active,
.datepicker table tr td.selected.disabled:active,
.datepicker table tr td.selected.disabled:hover:active,
.datepicker table tr td.selected.active,
.datepicker table tr td.selected:hover.active,
.datepicker table tr td.selected.disabled.active,
.datepicker table tr td.selected.disabled:hover.active {
background-color: #666666 \9;
}
.datepicker table tr td.active,
.datepicker table tr td.active:hover,
.datepicker table tr td.active.disabled,
Expand Down Expand Up @@ -447,18 +592,19 @@ a.editable-click.editable-disabled:hover {
.datepicker table tr td span.active.disabled:hover.active {
background-color: #003399 \9;
}
.datepicker table tr td span.old {
.datepicker table tr td span.old,
.datepicker table tr td span.new {
color: #999999;
}
.datepicker th.switch {
.datepicker th.datepicker-switch {
width: 145px;
}
.datepicker thead tr:first-child th,
.datepicker tfoot tr:first-child th {
.datepicker tfoot tr th {
cursor: pointer;
}
.datepicker thead tr:first-child th:hover,
.datepicker tfoot tr:first-child th:hover {
.datepicker tfoot tr th:hover {
background: #eeeeee;
}
.datepicker .cw {
Expand All @@ -478,3 +624,32 @@ a.editable-click.editable-disabled:hover {
width: 16px;
height: 16px;
}
.input-daterange input {
text-align: center;
}
.input-daterange input:first-child {
-webkit-border-radius: 3px 0 0 3px;
-moz-border-radius: 3px 0 0 3px;
border-radius: 3px 0 0 3px;
}
.input-daterange input:last-child {
-webkit-border-radius: 0 3px 3px 0;
-moz-border-radius: 0 3px 3px 0;
border-radius: 0 3px 3px 0;
}
.input-daterange .add-on {
display: inline-block;
width: auto;
min-width: 16px;
height: 18px;
padding: 4px 5px;
font-weight: normal;
line-height: 18px;
text-align: center;
text-shadow: 0 1px 0 #ffffff;
vertical-align: middle;
background-color: #eeeeee;
border: 1px solid #ccc;
margin-left: -5px;
margin-right: -5px;
}
5 changes: 2 additions & 3 deletions app/assets/stylesheets/bootstrap_and_overrides.css.scss
View file
@@ -1,8 +1,7 @@
@import "bootstrap";
body { padding-top: 30px; }
@import "bootstrap-responsive";

.brand
.navbar-brand
{
background: url(image-path("leo_logo_small.png")) no-repeat center;
height: 20px;
Expand All @@ -16,7 +15,7 @@ body { padding-top: 30px; }
padding-left: 29px !important;
}

.navbar-search .icon-search {
.navbar-search .glyphicon-search {
position: absolute;
top: 7px;
left: 11px;
Expand Down
4 changes: 2 additions & 2 deletions app/views/clubs/index.haml
View file
@@ -1,12 +1,12 @@
.cotainer
.row
.span3.d-sidebar
.col-md-3.d-sidebar
%ul.nav.nav-list.d-sidebar.affix-top{id: 'affix'}
- @districts.each do |district_name|
%li
%a{href: "##{district_name}"}= t(:'districts.district_title',multiple_district: '111', district: district_name)

.span9{:'data-spy' => 'scroll', }
.col-md-9{:'data-spy' => 'scroll', }
.page-header
%h1= t(:'clubs.caption.clubs_in_md', md: '111 Germany')
- @clubs.each do |district_name, clubs|
Expand Down

0 comments on commit cd82a3c

Please sign in to comment.