Download as
Browse Code »

Commit fcd1069b21e0837529572e9413ffaee77b2207a0

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 19bd91a0
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Adding new layout template '2leftbars' 

- moving boxes style definitions from base theme to templates
- fixing sidebars width to 190px everywhere

(ActionItem1979)
Showing 8 changed files with 306 additions and 46 deletions   Show diff stats
public/designs/templates/2leftbars/config.yml 0 → 100644
  Diff comments   View file @fcd1069
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
  1 +title: "2 sidebars at left of content"
  2 +description: "A template with 2 sidebars at left of content"
  3 +number_of_boxes: 3
public/designs/templates/2leftbars/stylesheets/style.css 0 → 100644
  Diff comments   View file @fcd1069
@@ -0,0 +1,27 @@ @@ -0,0 +1,27 @@
  1 +.box-1 {
  2 + margin: 0 0 0 400px;
  3 +}
  4 +
  5 +.box-1 .blocks {
  6 + width: 100%;
  7 + float: left;
  8 +}
  9 +
  10 +.box-2 {
  11 + position: relative;
  12 + float: left;
  13 + width: 190px;
  14 + padding-left: 10px;
  15 +}
  16 +
  17 +.box-3 {
  18 + position: relative;
  19 + float: left;
  20 + width: 190px;
  21 +}
  22 +
  23 +#profile-activity ul,
  24 +#profile-network ul,
  25 +#profile-wall ul {
  26 + width: 460px;
  27 +}
public/designs/templates/2leftbars/thumbnail.png 0 → 100644
View file @fcd1069

2.16 KB
public/designs/templates/2leftbars/thumbnail.svg 0 → 100644
  Diff comments   View file @fcd1069
@@ -0,0 +1,259 @@ @@ -0,0 +1,259 @@
  1 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
  2 +<!-- Created with Inkscape (http://www.inkscape.org/) -->
  3 +
  4 +<svg
  5 + xmlns:dc="http://purl.org/dc/elements/1.1/"
  6 + xmlns:cc="http://creativecommons.org/ns#"
  7 + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
  8 + xmlns:svg="http://www.w3.org/2000/svg"
  9 + xmlns="http://www.w3.org/2000/svg"
  10 + xmlns:xlink="http://www.w3.org/1999/xlink"
  11 + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
  12 + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
  13 + width="64px"
  14 + height="64px"
  15 + id="svg2383"
  16 + sodipodi:version="0.32"
  17 + inkscape:version="0.48.1 r9760"
  18 + sodipodi:docname="thumbnail.svg"
  19 + inkscape:output_extension="org.inkscape.output.svg.inkscape"
  20 + inkscape:export-filename="thumbnail.png"
  21 + inkscape:export-xdpi="90"
  22 + inkscape:export-ydpi="90"
  23 + version="1.1">
  24 + <defs
  25 + id="defs2385">
  26 + <linearGradient
  27 + id="linearGradient3263">
  28 + <stop
  29 + id="stop3265"
  30 + offset="0"
  31 + style="stop-color:#204a87;stop-opacity:1" />
  32 + <stop
  33 + id="stop3267"
  34 + offset="1"
  35 + style="stop-color:#729fcf;stop-opacity:1" />
  36 + </linearGradient>
  37 + <linearGradient
  38 + id="linearGradient3257"
  39 + inkscape:collect="always">
  40 + <stop
  41 + id="stop3259"
  42 + offset="0"
  43 + style="stop-color:#204a87;stop-opacity:1" />
  44 + <stop
  45 + id="stop3261"
  46 + offset="1"
  47 + style="stop-color:#729fcf;stop-opacity:1" />
  48 + </linearGradient>
  49 + <linearGradient
  50 + inkscape:collect="always"
  51 + id="linearGradient3245">
  52 + <stop
  53 + style="stop-color:#204a87;stop-opacity:1"
  54 + offset="0"
  55 + id="stop3247" />
  56 + <stop
  57 + style="stop-color:#729fcf;stop-opacity:1"
  58 + offset="1"
  59 + id="stop3249" />
  60 + </linearGradient>
  61 + <inkscape:perspective
  62 + sodipodi:type="inkscape:persp3d"
  63 + inkscape:vp_x="0 : 32 : 1"
  64 + inkscape:vp_y="0 : 1000 : 0"
  65 + inkscape:vp_z="64 : 32 : 1"
  66 + inkscape:persp3d-origin="32 : 21.333333 : 1"
  67 + id="perspective2391" />
  68 + <filter
  69 + inkscape:collect="always"
  70 + id="filter3241">
  71 + <feGaussianBlur
  72 + inkscape:collect="always"
  73 + stdDeviation="0.9075"
  74 + id="feGaussianBlur3243" />
  75 + </filter>
  76 + <linearGradient
  77 + inkscape:collect="always"
  78 + xlink:href="#linearGradient3245"
  79 + id="linearGradient3251"
  80 + x1="11.5"
  81 + y1="60.5"
  82 + x2="3.5"
  83 + y2="3.5"
  84 + gradientUnits="userSpaceOnUse" />
  85 + <linearGradient
  86 + inkscape:collect="always"
  87 + xlink:href="#linearGradient3263"
  88 + id="linearGradient3253"
  89 + x1="42.5"
  90 + y1="60.5"
  91 + x2="19.5"
  92 + y2="3.5"
  93 + gradientUnits="userSpaceOnUse"
  94 + gradientTransform="translate(0,20)" />
  95 + <linearGradient
  96 + inkscape:collect="always"
  97 + xlink:href="#linearGradient3257"
  98 + id="linearGradient3255"
  99 + x1="60.5"
  100 + y1="60.5"
  101 + x2="51.5"
  102 + y2="3.5"
  103 + gradientUnits="userSpaceOnUse" />
  104 + <linearGradient
  105 + inkscape:collect="always"
  106 + xlink:href="#linearGradient3263"
  107 + id="linearGradient3018"
  108 + gradientUnits="userSpaceOnUse"
  109 + gradientTransform="translate(0,20)"
  110 + x1="42.5"
  111 + y1="60.5"
  112 + x2="19.5"
  113 + y2="3.5" />
  114 + <linearGradient
  115 + inkscape:collect="always"
  116 + xlink:href="#linearGradient3257"
  117 + id="linearGradient3023"
  118 + gradientUnits="userSpaceOnUse"
  119 + x1="60.5"
  120 + y1="60.5"
  121 + x2="51.5"
  122 + y2="3.5" />
  123 + </defs>
  124 + <sodipodi:namedview
  125 + id="base"
  126 + pagecolor="#ffffff"
  127 + bordercolor="#666666"
  128 + borderopacity="1.0"
  129 + inkscape:pageopacity="0.0"
  130 + inkscape:pageshadow="2"
  131 + inkscape:zoom="5.4395823"
  132 + inkscape:cx="28.782841"
  133 + inkscape:cy="24.646494"
  134 + inkscape:current-layer="layer1"
  135 + showgrid="true"
  136 + inkscape:document-units="px"
  137 + inkscape:grid-bbox="true"
  138 + inkscape:window-width="1278"
  139 + inkscape:window-height="760"
  140 + inkscape:window-x="0"
  141 + inkscape:window-y="19"
  142 + objecttolerance="10"
  143 + gridtolerance="10"
  144 + guidetolerance="10"
  145 + inkscape:window-maximized="0">
  146 + <inkscape:grid
  147 + type="xygrid"
  148 + id="grid2382"
  149 + visible="true"
  150 + enabled="true"
  151 + originx="0.5px"
  152 + originy="0.5px"
  153 + empcolor="#0000ff"
  154 + empopacity="0.1254902"
  155 + dotted="true" />
  156 + </sodipodi:namedview>
  157 + <metadata
  158 + id="metadata2388">
  159 + <rdf:RDF>
  160 + <cc:Work
  161 + rdf:about="">
  162 + <dc:format>image/svg+xml</dc:format>
  163 + <dc:type
  164 + rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
  165 + <dc:title></dc:title>
  166 + </cc:Work>
  167 + </rdf:RDF>
  168 + </metadata>
  169 + <g
  170 + id="layer1"
  171 + inkscape:label="Layer 1"
  172 + inkscape:groupmode="layer">
  173 + <rect
  174 + rx="2"
  175 + ry="2"
  176 + style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3241);enable-background:accumulate"
  177 + id="rect3184"
  178 + width="11"
  179 + height="59"
  180 + x="2.5"
  181 + y="2.5" />
  182 + <rect
  183 + rx="2"
  184 + ry="2"
  185 + y="2.5"
  186 + x="16.5"
  187 + height="59"
  188 + width="12"
  189 + id="rect3186"
  190 + style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3241);enable-background:accumulate" />
  191 + <rect
  192 + rx="2"
  193 + ry="2"
  194 + style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter3241);enable-background:accumulate"
  195 + id="rect3188"
  196 + width="31"
  197 + height="59"
  198 + x="31.5"
  199 + y="2.5" />
  200 + <rect
  201 + y="1.5"
  202 + x="1.5"
  203 + height="59"
  204 + width="11"
  205 + id="rect2395"
  206 + style="opacity:1;fill:url(#linearGradient3251);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  207 + ry="2" />
  208 + <rect
  209 + ry="1"
  210 + style="opacity:0.6;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  211 + id="rect3158"
  212 + width="9"
  213 + height="57"
  214 + x="2.5"
  215 + y="2.5" />
  216 + <g
  217 + id="g3010"
  218 + transform="translate(15,-20)">
  219 + <rect
  220 + ry="2"
  221 + style="fill:url(#linearGradient3018);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  222 + id="rect3156"
  223 + width="31"
  224 + height="59"
  225 + x="15.5"
  226 + y="21.5" />
  227 + <rect
  228 + inkscape:export-ydpi="90"
  229 + inkscape:export-xdpi="90"
  230 + ry="1"
  231 + style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
  232 + id="rect3162"
  233 + width="29"
  234 + height="57"
  235 + x="16.5"
  236 + y="22.5" />
  237 + </g>
  238 + <g
  239 + id="g3014"
  240 + transform="translate(-34,0)">
  241 + <rect
  242 + ry="2"
  243 + y="1.5"
  244 + x="49.5"
  245 + height="59"
  246 + width="12"
  247 + id="rect3154"
  248 + style="fill:url(#linearGradient3023);fill-opacity:1;fill-rule:nonzero;stroke:#204a87;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  249 + <rect
  250 + ry="1"
  251 + y="2.5"
  252 + x="50.5"
  253 + height="57"
  254 + width="10"
  255 + id="rect3164"
  256 + style="opacity:0.6;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
  257 + </g>
  258 + </g>
  259 +</svg>
public/designs/templates/default/stylesheets/style.css
  Diff comments   View file @fcd1069
1 -  
2 -#boxes {  
3 - /* none */  
4 -}  
5 -  
6 .box-1 { 1 .box-1 {
7 - margin: 0px 210px 0px 210px; 2 + margin: 0 200px 0 200px;
8 } 3 }
  4 +
9 .box-1 .blocks { 5 .box-1 .blocks {
10 width: 100%; 6 width: 100%;
11 float: left; 7 float: left;
12 } 8 }
13 9
14 .box-2 { 10 .box-2 {
  11 + position: relative;
15 float: left; 12 float: left;
16 - width: 200px; 13 + width: 190px;
17 } 14 }
18 15
19 .box-3 { 16 .box-3 {
20 - float: right;  
21 - width: 200px;  
22 -}  
23 -  
24 -.block {  
25 position: relative; 17 position: relative;
26 - padding: 10px 0px;  
27 - float: none; 18 + float: right;
  19 + width: 190px;
28 } 20 }
29 21
30 #profile-activity ul, 22 #profile-activity ul,
public/designs/templates/leftbar/stylesheets/style.css
  Diff comments   View file @fcd1069
1 .box-1 { 1 .box-1 {
2 - margin: 0 30px 0 210px; 2 + margin: 0 0 0 200px;
3 } 3 }
4 4
5 .box-1 .blocks { 5 .box-1 .blocks {
@@ -8,16 +8,11 @@ @@ -8,16 +8,11 @@
8 } 8 }
9 9
10 .box-2 { 10 .box-2 {
  11 + position: relative;
11 float: left; 12 float: left;
12 width: 190px; 13 width: 190px;
13 } 14 }
14 15
15 -.block {  
16 - position: relative;  
17 - padding: 10px 0;  
18 - float: none;  
19 -}  
20 -  
21 #leave_scrap_content_limit, 16 #leave_scrap_content_limit,
22 #leave_scrap_content_left { 17 #leave_scrap_content_left {
23 float: none; 18 float: none;
public/designs/templates/rightbar/stylesheets/style.css
  Diff comments   View file @fcd1069
1 .box-1 { 1 .box-1 {
2 - margin: 0 210px 0 30px; 2 + margin: 0 200px 0 0;
3 } 3 }
4 4
5 .box-1 .blocks { 5 .box-1 .blocks {
@@ -8,14 +8,9 @@ @@ -8,14 +8,9 @@
8 } 8 }
9 9
10 .box-2 { 10 .box-2 {
11 - float: right;  
12 - width: 200px;  
13 -}  
14 -  
15 -.block {  
16 position: relative; 11 position: relative;
17 - padding: 10px 0;  
18 - float: none; 12 + float: right;
  13 + width: 190px;
19 } 14 }
20 15
21 #leave_scrap_content_limit, 16 #leave_scrap_content_limit,
public/designs/themes/base/style.css
  Diff comments   View file @fcd1069
@@ -280,23 +280,6 @@ body, th, td, input { @@ -280,23 +280,6 @@ body, th, td, input {
280 -webkit-border-radius: 0px; 280 -webkit-border-radius: 0px;
281 } 281 }
282 282
283 -/***************************** boxes ********************************/  
284 -  
285 -.template-default .box-1 { /* Center */  
286 - position: relative;  
287 - margin: 0px 200px 0px 200px;  
288 -}  
289 -  
290 -.template-default .box-2 { /* Left */  
291 - position: relative;  
292 - width: 190px;  
293 -}  
294 -  
295 -.template-default .box-3 { /* Right */  
296 - position: relative;  
297 - width: 190px;  
298 -}  
299 -  
300 /************************** main content *****************************/ 283 /************************** main content *****************************/
301 284
302 #main-content-wrapper-1, #main-content-wrapper-2, 285 #main-content-wrapper-1, #main-content-wrapper-2,
@@ -325,6 +308,12 @@ body, th, td, input { @@ -325,6 +308,12 @@ body, th, td, input {
325 border-bottom: 2px solid #2e3436; 308 border-bottom: 2px solid #2e3436;
326 } 309 }
327 310
  311 +.block {
  312 + position: relative;
  313 + padding: 10px 0;
  314 + float: none;
  315 +}
  316 +
328 /***************************** header ********************************/ 317 /***************************** header ********************************/
329 #theme-header { 318 #theme-header {
330 height: 20px; 319 height: 20px;