Commit c54209ccc875a36149eb39378125635d0e6e220a
Exists in
master
and in
29 other branches
Merge branch 'stable'
Showing
6 changed files
with
35 additions
and
45 deletions
Show diff stats
app/models/location_block.rb
... | ... | @@ -19,7 +19,7 @@ class LocationBlock < Block |
19 | 19 | content_tag('div', |
20 | 20 | '<img src="http://maps.google.com/staticmap?center=' + profile.lat.to_s() + |
21 | 21 | ',' + profile.lng.to_s() + '&zoom=' + zoom.to_s() + |
22 | - '&size=205x250&maptype=' + map_type + '&markers=' + profile.lat.to_s() + ',' + | |
22 | + '&size=190x250&maptype=' + map_type + '&markers=' + profile.lat.to_s() + ',' + | |
23 | 23 | profile.lng.to_s() + ',green&key=' + GoogleMaps::key(profile.default_hostname) + '&sensor=false"/>', |
24 | 24 | :class => 'the-localization-map' ) |
25 | 25 | else | ... | ... |
public/designs/templates/leftbar/stylesheets/style.css
1 | - | |
2 | -#boxes { | |
3 | - /* none */ | |
4 | -} | |
5 | - | |
6 | 1 | .box-1 { |
7 | - margin: 0px 30px 0px 260px; | |
2 | + margin: 0 0 0 200px; | |
8 | 3 | } |
4 | + | |
9 | 5 | .box-1 .blocks { |
10 | 6 | width: 100%; |
11 | 7 | float: left; |
... | ... | @@ -13,20 +9,11 @@ |
13 | 9 | |
14 | 10 | .box-2 { |
15 | 11 | float: left; |
16 | - width: 230px; | |
12 | + width: 190px; | |
17 | 13 | } |
18 | 14 | |
19 | 15 | .block { |
20 | 16 | position: relative; |
21 | - padding: 10px 0px; | |
17 | + padding: 10px 0; | |
22 | 18 | float: none; |
23 | 19 | } |
24 | - | |
25 | -#article-actions { | |
26 | - margin-right: 130px; | |
27 | -} | |
28 | - | |
29 | -#article-actions { | |
30 | - margin-right: 130px; | |
31 | -} | |
32 | - | ... | ... |
public/designs/templates/rightbar/stylesheets/style.css
1 | - | |
2 | -#boxes { | |
3 | - /* none */ | |
4 | -} | |
5 | - | |
6 | 1 | .box-1 { |
7 | - margin: 0px 260px 0px 30px; | |
2 | + margin: 0 200px 0 0; | |
8 | 3 | } |
4 | + | |
9 | 5 | .box-1 .blocks { |
10 | 6 | width: 100%; |
11 | 7 | float: right; |
... | ... | @@ -13,12 +9,11 @@ |
13 | 9 | |
14 | 10 | .box-2 { |
15 | 11 | float: right; |
16 | - width: 230px; | |
12 | + width: 190px; | |
17 | 13 | } |
18 | 14 | |
19 | 15 | .block { |
20 | 16 | position: relative; |
21 | - padding: 10px 0px; | |
17 | + padding: 10px 0; | |
22 | 18 | float: none; |
23 | 19 | } |
24 | - | ... | ... |
public/designs/themes/base/style.css
... | ... | @@ -269,7 +269,6 @@ body, th, td, input { |
269 | 269 | #content .main-block h1, #not-found h1, #access-denied h1 { |
270 | 270 | font-variant: small-caps; |
271 | 271 | color: #555753; |
272 | - font-size: 16px; | |
273 | 272 | text-align: left; |
274 | 273 | border-bottom: 2px solid #2e3436; |
275 | 274 | } |
... | ... | @@ -776,7 +775,6 @@ X.sep { |
776 | 775 | #content .no-boxes h1 { |
777 | 776 | font-variant: small-caps; |
778 | 777 | color: #555753; |
779 | - font-size: 18px; | |
780 | 778 | text-align: left; |
781 | 779 | border-bottom: 2px solid #2e3436; /*8C0*/ |
782 | 780 | } | ... | ... |
public/stylesheets/application.css
... | ... | @@ -158,11 +158,11 @@ div#notice { |
158 | 158 | margin: 10px 0px; |
159 | 159 | /*color: #2A5896;*/ |
160 | 160 | } |
161 | -#content h1 { font-size: 24px } | |
162 | -#content h2 { font-size: 20px } | |
163 | -#content h3 { font-size: 18px } | |
164 | -#content h4 { font-size: 16px } | |
165 | -#content h5 { font-size: 14px } | |
161 | +#content h1 { font-size: 20px } | |
162 | +#content h2 { font-size: 18px } | |
163 | +#content h3 { font-size: 16px } | |
164 | +#content h4 { font-size: 14px } | |
165 | +#content h5 { font-size: 13px } | |
166 | 166 | #content h6 { font-size: 12px } |
167 | 167 | |
168 | 168 | #content .block-title { |
... | ... | @@ -589,9 +589,6 @@ code input { |
589 | 589 | list-style: none; |
590 | 590 | margin-bottom: 5px; |
591 | 591 | } |
592 | -#online-doc-navigation h1 { | |
593 | - font-size: 16px; | |
594 | -} | |
595 | 592 | |
596 | 593 | #online-doc-navigation h1, #online-doc h1 { |
597 | 594 | text-align: left; |
... | ... | @@ -2047,8 +2044,8 @@ div#activation_enterprise div { |
2047 | 2044 | .the-localization-map { |
2048 | 2045 | overflow: hidden; |
2049 | 2046 | margin: auto; |
2050 | - max-width: 205px; | |
2051 | - padding: 3px; | |
2047 | + max-width: 190px; | |
2048 | + padding: 0px; | |
2052 | 2049 | background: #FFF; |
2053 | 2050 | border: 1px solid #888; |
2054 | 2051 | } |
... | ... | @@ -2553,10 +2550,10 @@ div#activation_enterprise div { |
2553 | 2550 | |
2554 | 2551 | .controller-cms #media-listing-iframe { |
2555 | 2552 | float: right; |
2556 | - width: 40%; | |
2553 | + width: 380px; | |
2557 | 2554 | height: 630px; |
2558 | 2555 | border: none; |
2559 | - margin: 104px 20px 0px 0px; | |
2556 | + margin-top: 104px; | |
2560 | 2557 | padding: 0px; |
2561 | 2558 | overflow: hidden; |
2562 | 2559 | } |
... | ... | @@ -2567,6 +2564,7 @@ div#activation_enterprise div { |
2567 | 2564 | |
2568 | 2565 | .controller-cms div.with_media_panel { |
2569 | 2566 | float: left; |
2567 | + width: 500px; | |
2570 | 2568 | } |
2571 | 2569 | |
2572 | 2570 | div.with_media_panel .formfield input { |
... | ... | @@ -2717,7 +2715,7 @@ div.event-info div.event-description { |
2717 | 2715 | } |
2718 | 2716 | |
2719 | 2717 | div#article-parent { |
2720 | - margin-bottom: 5px; | |
2718 | + margin: 5px 0px; | |
2721 | 2719 | text-align: right; |
2722 | 2720 | font-style: italic; |
2723 | 2721 | } |
... | ... | @@ -3019,11 +3017,12 @@ h1#agenda-title { |
3019 | 3017 | } |
3020 | 3018 | |
3021 | 3019 | .no-boxes { |
3022 | - margin: 0px 200px 0px 200px; | |
3020 | + margin: 0px; | |
3023 | 3021 | } |
3024 | 3022 | |
3025 | -.controller-search .no-boxes { | |
3026 | - margin: 0px; | |
3023 | +.controller-content_viewer .no-boxes, | |
3024 | +.controller-profile .no-boxes { | |
3025 | + margin: 0px 200px; | |
3027 | 3026 | } |
3028 | 3027 | |
3029 | 3028 | .controller-profile #content .no-boxes h1, | ... | ... |
public/stylesheets/tinymce.css
... | ... | @@ -14,3 +14,14 @@ object, embed { |
14 | 14 | height: 150px; |
15 | 15 | background-image: url(../designs/icons/tango/Tango/22x22/actions/media-playback-start.png); |
16 | 16 | } |
17 | + | |
18 | +body.mceContentBody h2 { font-size: 18px } | |
19 | +body.mceContentBody h3 { font-size: 16px } | |
20 | +body.mceContentBody h4 { font-size: 14px } | |
21 | +body.mceContentBody h5 { font-size: 13px } | |
22 | +body.mceContentBody h6 { font-size: 12px } | |
23 | + | |
24 | +body.mceContentBody h1, body.mceContentBody h2, body.mceContentBody h3, | |
25 | +body.mceContentBody h4, body.mceContentBody h5, body.mceContentBody h6 { | |
26 | + margin: 10px 0px; | |
27 | +} | ... | ... |