From 490501ef43715d53126a4a6b93df4affab3b52fc Mon Sep 17 00:00:00 2001 From: Olga Brani Date: Thu, 31 May 2012 16:15:45 +0300 Subject: [PATCH] Responsive with initial-scale:1.0 --- cloudcms/static/cloudcms/css/forms.css | 9 +++++++-- cloudcms/static/cloudcms/css/max480.css | 3 +++ cloudcms/static/cloudcms/css/max768.css | 7 +++++++ cloudcms/static/cloudcms/css/max960.css | 7 +++++++ cloudcms/static/cloudcms/css/modules.css | 11 +++++------ cloudcms/templates/cms/base.html | 6 +++++- 6 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 cloudcms/static/cloudcms/css/max480.css create mode 100644 cloudcms/static/cloudcms/css/max768.css create mode 100644 cloudcms/static/cloudcms/css/max960.css diff --git a/cloudcms/static/cloudcms/css/forms.css b/cloudcms/static/cloudcms/css/forms.css index cca4a1a..aae5aea 100644 --- a/cloudcms/static/cloudcms/css/forms.css +++ b/cloudcms/static/cloudcms/css/forms.css @@ -85,7 +85,8 @@ form input[readonly=true] { /*background-color: #ddd;*/ color: #5e5e5e; } form.innerlabels .with-checkbox .checkbox-widget { margin-top:15px; } form.innerlabels .with-checkbox .checkbox-label { left:2.5em; top:17px; } -form .extra-img { display:block; width:21px; height:21px; overflow:hidden; position:absolute; left:440px;top:10px; z-index:101;} +form .extra-img { display:block; width:21px; height:21px; overflow:hidden; position:absolute; left:440px; bottom:10px; z-index:101;} +form .with-checkbox .extra-img { top:20px; } form .with-errors .extra-img { background:url(../images/symbols.png) no-repeat -58px -3px;} form .with-errors textarea+.extra-img, form .with-errors noscript+.extra-img { background:transparent;} @@ -95,5 +96,9 @@ form.innerlabels .with-errors .extra-img { left:290px;} form input[readonly="True"]+ span.extra-img { background:url(../images/symbols.png) no-repeat -111px -3px;} .errorlist { margin:0; padding:0;} .errorlist li { list-style:none outside;} + +@media screen and (max-width : 583px) { + form .extra-img { left:222px; } + .form-error { margin-left:0!important; } - +} \ No newline at end of file diff --git a/cloudcms/static/cloudcms/css/max480.css b/cloudcms/static/cloudcms/css/max480.css new file mode 100644 index 0000000..47efa34 --- /dev/null +++ b/cloudcms/static/cloudcms/css/max480.css @@ -0,0 +1,3 @@ +.container .navigation ul li { display:block; } +.two-cols-blog .rt { width:auto; padding-right:0; margin-left:0; float:none;} +.resources .categories ul li { display:block; float:none;} diff --git a/cloudcms/static/cloudcms/css/max768.css b/cloudcms/static/cloudcms/css/max768.css new file mode 100644 index 0000000..c4ed04e --- /dev/null +++ b/cloudcms/static/cloudcms/css/max768.css @@ -0,0 +1,7 @@ +.two-cols .rt { float:none; width:auto; margin-bottom:10px;} +.two-cols .lt { float:none; width:auto; } +.container .navigation { height:auto; margin-bottom:30px; } +.bg-wrap { background-position:-9999px -9999px; } +.buttons-list.fixpos { position:static; } +.buttons-list .button { margin-left:0; } +form input.submit, form input[type="submit"] { margin:0; } \ No newline at end of file diff --git a/cloudcms/static/cloudcms/css/max960.css b/cloudcms/static/cloudcms/css/max960.css new file mode 100644 index 0000000..770d170 --- /dev/null +++ b/cloudcms/static/cloudcms/css/max960.css @@ -0,0 +1,7 @@ +.container { width:100%; } +.wrapper { width:83%; padding:36px 8% 36px 8%;} +.footer .wrapper { padding-left:8%; padding-right:8%; } +.two-cols .rt { width:45% } +.two-cols .rt img { max-width:100%; } +.two-cols .lt { width:45%; } +.two-cols-blog .rt { width:25%; padding-right:0; margin-left:30px;} diff --git a/cloudcms/static/cloudcms/css/modules.css b/cloudcms/static/cloudcms/css/modules.css index c805e10..259d1d4 100644 --- a/cloudcms/static/cloudcms/css/modules.css +++ b/cloudcms/static/cloudcms/css/modules.css @@ -12,7 +12,7 @@ img.right { margin:0 0 1em 1em; float:right;} .footer a { color:#B3B3B3; text-decoration:none; transition:color 0.15s ease-in-out 0s; -moz-transition: color 0.15s ease-in-out 0s; -webkit-transition: color 0.15s ease-in-out 0s; -o-transition: color 0.15s ease-in-out 0s; } .footer:hover a { color:#808080;} .footer a:hover { color:#000;} -.footer ul { float:left; margin:0 0 0 22px; width:140px; padding:0;} +.footer ul { float:left; margin:0 22px 0 0; width:140px; padding:0;} .footer ul li { padding:0; margin:0; list-style:none outside;} .footer ul li:first-child { margin-bottom:1em; } .footer .clearfix { padding-bottom:20px;} @@ -33,8 +33,7 @@ img.right { margin:0 0 1em 1em; float:right;} .mainlogo h1 { line-height:100%; font-size:1em; } .container .navigation { margin:20px 0 0; font-size:1.154em; height:95px;} .container .navigation ul { margin:5px 0; padding:0;} -.container .navigation ul li { list-style:none outside; padding:0; margin:0 0 0 1em; display:inline-block;} -.container .navigation ul li:first-child { margin-left:0;} +.container .navigation ul li { list-style:none outside; padding:0; margin:0 1em 0 0; display:inline-block;} .container .navigation ul li a { color:#000; text-decoration:none; } .container .navigation ul li a:hover { color:#F89A1C; } .container .navigation ul li.active a { color:#F89A1C; } @@ -72,7 +71,7 @@ img.right { margin:0 0 1em 1em; float:right;} .follow ul li p a { color:#808080;} .posts ul { margin:0;padding:0; } .posts ul li { padding:0; margin:0 0 50px; list-style:none outside; } -.posts ul li img { max-width:580px; margin-bottom:1em;} +.posts ul li img { max-width:100%; margin-bottom:1em;} .posts ul li p.info { padding-bottom:10px; margin-bottom:20px; font-size:0.769em; color:#808080; background:url(../images/dots.jpg) repeat-x bottom ;} .article p.info { margin-top:20px; padding-top:10px; font-size:0.769em; color:#808080; } .article h2, .posts h2 { color:#ef4f53; } @@ -126,7 +125,7 @@ a.videolink:hover { background:url(../images/video_image.png) .resources .categories ul li a.selected { color: #000000 } .resources .categories ul li.inactive { opacity: 0.3; } .resources .categories ul li.active { font-weight: bold; opacity: 1; } -.resources .list { line-height: 1em; margin-top: 60px; position: relative; width:855px; } +.resources .list { line-height: 1em; margin-top: 60px; position: relative; margin-right:-35px; } .resources .list .resource-wrapper.first .resource { margin-left: 0; } .resources .list .resource-wrapper { float: left; height: 250px; margin-bottom: 22px; margin-right: 35px; overflow: hidden; position: relative; width: 250px; } .resources .list .resource-wrapper.first { margin-left: 0; } @@ -171,7 +170,7 @@ table td.consumed { color: #9D261D; } .button.back.right { right: 0; } .buttons-list .button { margin-left: 10px; } .button.back { z-index: 500; } -a.button { border:0 none; color: #FFFFFF; display: block; text-align: center; background-color: #3582AC; letter-spacing: 1px; line-height: 22px; padding: 0.8em 22px; text-decoration: none;} +a.button { border:0 none; color: #FFFFFF; display: inline-block; text-align: center; background-color: #3582AC; letter-spacing: 1px; line-height: 22px; padding: 0.8em 22px; text-decoration: none;} a.button:hover { background-color: #F89A1C; border:0 none; color:#fff;} /*pagination*/ diff --git a/cloudcms/templates/cms/base.html b/cloudcms/templates/cms/base.html index e0e9353..5814c7a 100644 --- a/cloudcms/templates/cms/base.html +++ b/cloudcms/templates/cms/base.html @@ -6,7 +6,8 @@ {% block page.title %}{% if feincms_page.page_title %}{{ feincms_page.page_title }} {% else %}{{ feincms_page.title }}{% endif %} | {{ APP.title }}{% endblock %} - + + {% block favicons %} @@ -19,6 +20,9 @@ + + + {% endblock css %} {% block headjs %} -- 1.7.10.4