From 16d45e5c13ee03783a62ab35a9989748d8e14711 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 19 Dec 2011 18:02:43 +0100 Subject: quattro: first work on jot style --- view/jot-header.tpl | 18 ++--- view/jot.tpl | 96 +++++++++---------------- view/theme/duepuntozero/jot.tpl | 77 ++++++++++++++++++++ view/theme/quattro/colors.less | 12 ++++ view/theme/quattro/jot.tpl | 77 -------------------- view/theme/quattro/quattro.less | 156 ++++++++++++++++++++++++---------------- view/theme/quattro/style.css | 131 ++++++++++++++++++++++----------- 7 files changed, 317 insertions(+), 250 deletions(-) create mode 100644 view/theme/duepuntozero/jot.tpl delete mode 100644 view/theme/quattro/jot.tpl (limited to 'view') diff --git a/view/jot-header.tpl b/view/jot-header.tpl index ecfed6c42..4186ef78e 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -81,7 +81,7 @@ function initEditor(cb){ ed.onInit.add(function(ed) { ed.pasteAsPlainText = true; $("#profile-jot-text-loading").hide(); - $("#profile-jot-submit-wrapper").show(); + $(".jothidden").show(); if (typeof cb!="undefined") cb(); }); @@ -98,19 +98,21 @@ function initEditor(cb){ } } +function enableOnUser(){ + if (editor) return; + $(this).val(""); + initEditor(); +} + {{ endif }} - - diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl new file mode 100644 index 000000000..71b92986d --- /dev/null +++ b/view/theme/duepuntozero/jot.tpl @@ -0,0 +1,77 @@ + +
+
+
 
+
+
+
+ +
+ + + + + + + + + + + + {{ if $content }}{{ endif }} + + + +
+
+
diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index d36ff05b0..24cce5952 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -78,3 +78,15 @@ @CommentBoxFullBorderColor: @Grey5; @TagColor: @Grey1; + +@JotToolsBackgroundColor: @Metalic4; +@JotToolsBorderColor: @Metalic2; +@JotToolsOverBackgroundColor: @Metalic3; +@JotToolsOverBorderColor: @Metalic1; +@JotToolsText: @Grey2; +@JotSubmitBackgroundColor: @Grey2; +@JotSubmitText: @Grey4; +@JotSubmitOverBackgroundColor: @Metalic1; +@JotSubmitOverText: @Grey4; +@JotPermissionUnlockBackgroundColor: @Grey2; +@JotPermissionLockBackgroundColor: @Grey4; diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl deleted file mode 100644 index d65ac8b17..000000000 --- a/view/theme/quattro/jot.tpl +++ /dev/null @@ -1,77 +0,0 @@ - -
-
-
 
-
-
-
- -
- - - - - - - - - - - - {{ if $content }}{{ endif }} - - - -
-
-
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 2e61b9182..81943c9b3 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -9,6 +9,7 @@ body { margin: 50px 0px 0px 0px; display:table; } +h4 { font-size: 1.1em } .shadow(@x: 0px, @y: 5px){ -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); @@ -40,6 +41,7 @@ a:hover {color: @LinkHover; text-decoration: underline; } .left { float: left; } .right { float: right; } .hidden { display: none; } +.clear { clear: both; } code { font-family: Courier, monospace; @@ -338,6 +340,7 @@ section { position: relative; padding: 10px; margin-bottom: 20px; + width: 780px; } .wall-item-decor { position: absolute; left: 790px; top: -10px; width: 16px;} .unstarred { display: none; } @@ -457,77 +460,85 @@ section { } } +/* editor */ +#jot { -#profile-jot-wrapper { width: 100%; margin: 0px 2em 20px 0px; -} -.profile-jot-text { - height: 1em; width: 100%; font-size: 10px; - color: @CommentBoxEmptyColor; - border: 1px solid @CommentBoxEmptyBorderColor; - padding:0.3em; -} -#profile-jot-plugin-wrapper, -#profile-jot-submit-wrapper { - margin-top: 10px; -} - - -#profile-jot-submit { - float: left; -} -#profile-upload-wrapper{ - float: left; - margin-left: 10px; -} -#profile-attach-wrapper, -#profile-rotator, -#profile-link-wrapper, -#profile-youtube-wrapper, -#profile-video-wrapper, -#profile-audio-wrapper, -#profile-location-wrapper, -#profile-nolocation-wrapper, -#profile-title-wrapper { - float: left; - margin-left: 20px; -} - -#profile-jot-perms { - float: left; - margin-left: 35px; - margin-right: 35px; -} + .profile-jot-text { + height: 1em; width: 99%; font-size: 10px; + color: @CommentBoxEmptyColor; + border: 1px solid @CommentBoxEmptyBorderColor; + padding:0.3em; + } -#profile-jot-perms-end { - /*clear: left;*/ - height: 20px; -} + #jot-tools { + margin: 0px; padding: 0px; + height: 40px; overflow: none; + width: 800px; + background-color: @JotToolsBackgroundColor; + border-bottom: 2px solid @JotToolsBorderColor; + li { + list-style: none; + float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid @JotToolsBorderColor; + a { + display: block; + color: @JotToolsText; + width: 100%; + height:40px; + text-align: center; + line-height: 40px; + overflow: hidden; + } + } + li:hover { + background-color: @JotToolsOverBackgroundColor; + border-bottom: 2px solid @JotToolsOverBorderColor; + } + li.perms { + float: right; + width: 40px; + a.unlock { + width: 30px; + border-left: 10px solid @JotPermissionUnlockBackgroundColor; + background-color: @JotPermissionUnlockBackgroundColor; + } + a.lock { + width: 30px; + border-left: 10px solid @JotPermissionLockBackgroundColor; + background-color: @JotPermissionLockBackgroundColor; + } + + } + li.submit { + float: right; + background-color: @JotSubmitBackgroundColor; + border-bottom: 2px solid @JotSubmitBackgroundColor; + border-right: 1px solid @Grey4; + border-left: 1px solid @Grey4; + input { + border: 0px; margin: 0px; padding: 0px; + background-color: @JotSubmitBackgroundColor; + color: @JotSubmitText; + width: 80px; height: 40px; + line-height: 40px; + } + input:hover { + background-color: @JotSubmitOverBackgroundColor; + color: @JotSubmitOverText; + } + } + } -#profile-jot-plugin-end{ - clear: both; -} -.profile-jot-net { - float: left; - margin-right: 10px; - margin-top: 5px; - margin-bottom: 5px; } -#profile-jot-networks-end { - clear: both; -} -#profile-jot-end, #about-jot-end { - margin-bottom: 15px; -} -#about-jot-submit-wrapper { - margin-top: 15px; -} /** buttons **/ /*input[type="submit"] { border: 0px; @@ -717,6 +728,31 @@ ul.tabs { &.radio .field_help { margin-left: 0px; } } +#profile-edit-links li { + list-style: none; +} + +/* oauth */ +.oauthapp { + height: auto; overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} + /* page footer */ footer { height: 100px; display: table-row; } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 6de9800af..0ba05b8ac 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -168,6 +168,9 @@ body { margin: 50px 0px 0px 0px; display: table; } +h4 { + font-size: 1.1em; +} a, a:link { color: #005c94; text-decoration: none; @@ -189,6 +192,9 @@ a:hover { .hidden { display: none; } +.clear { + clear: both; +} code { font-family: Courier, monospace; white-space: pre; @@ -609,6 +615,7 @@ section { position: relative; padding: 10px; margin-bottom: 20px; + width: 780px; } .wall-item-decor { position: absolute; @@ -779,67 +786,82 @@ section { background: url("../../../images/tag.png") no-repeat center right; color: #ffffff; } -#profile-jot-wrapper { +/* editor */ +#jot { width: 100%; margin: 0px 2em 20px 0px; } -.profile-jot-text { +#jot .profile-jot-text { height: 1em; - width: 100%; + width: 99%; font-size: 10px; color: #999999; border: 1px solid #999999; padding: 0.3em; } -#profile-jot-plugin-wrapper, #profile-jot-submit-wrapper { - margin-top: 10px; +#jot #jot-tools { + margin: 0px; + padding: 0px; + height: 40px; + overflow: none; + width: 800px; + background-color: #0e232e; + border-bottom: 2px solid #9eabb0; } -#profile-jot-submit { +#jot #jot-tools li { + list-style: none; float: left; + width: 80px; + height: 40px; + border-bottom: 2px solid #9eabb0; } -#profile-upload-wrapper { - float: left; - margin-left: 10px; -} -#profile-attach-wrapper, -#profile-rotator, -#profile-link-wrapper, -#profile-youtube-wrapper, -#profile-video-wrapper, -#profile-audio-wrapper, -#profile-location-wrapper, -#profile-nolocation-wrapper, -#profile-title-wrapper { - float: left; - margin-left: 20px; +#jot #jot-tools li a { + display: block; + color: #cccccc; + width: 100%; + height: 40px; + text-align: center; + line-height: 40px; + overflow: hidden; } -#profile-jot-perms { - float: left; - margin-left: 35px; - margin-right: 35px; +#jot #jot-tools li:hover { + background-color: #364e59; + border-bottom: 2px solid #bdcdd4; } -#profile-jot-perms-end { - /*clear: left;*/ - - height: 20px; +#jot #jot-tools li.perms { + float: right; + width: 40px; } -#profile-jot-plugin-end { - clear: both; +#jot #jot-tools li.perms a.unlock { + width: 30px; + border-left: 10px solid #cccccc; + background-color: #cccccc; } -.profile-jot-net { - float: left; - margin-right: 10px; - margin-top: 5px; - margin-bottom: 5px; +#jot #jot-tools li.perms a.lock { + width: 30px; + border-left: 10px solid #666666; + background-color: #666666; } -#profile-jot-networks-end { - clear: both; +#jot #jot-tools li.submit { + float: right; + background-color: #cccccc; + border-bottom: 2px solid #cccccc; + border-right: 1px solid #666666; + border-left: 1px solid #666666; } -#profile-jot-end, #about-jot-end { - margin-bottom: 15px; +#jot #jot-tools li.submit input { + border: 0px; + margin: 0px; + padding: 0px; + background-color: #cccccc; + color: #666666; + width: 80px; + height: 40px; + line-height: 40px; } -#about-jot-submit-wrapper { - margin-top: 15px; +#jot #jot-tools li.submit input:hover { + background-color: #bdcdd4; + color: #666666; } /** buttons **/ /*input[type="submit"] { @@ -1025,6 +1047,31 @@ ul.tabs li .active { .field.radio .field_help { margin-left: 0px; } +#profile-edit-links li { + list-style: none; +} +/* oauth */ +.oauthapp { + height: auto; + overflow: auto; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; +} +.oauthapp img { + float: left; + width: 48px; + height: 48px; + margin: 10px; +} +.oauthapp img.noicon { + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; +} +.oauthapp a { + float: left; +} /* page footer */ footer { height: 100px; -- cgit v1.2.3 From c3d12bc77ea3af6adc72f078d06bb9b199af6b45 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 19 Dec 2011 18:03:03 +0100 Subject: quattro: fix icons in oauth settings page --- view/settings_oauth.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/settings_oauth.tpl b/view/settings_oauth.tpl index bc5866bec..0de0dbe98 100644 --- a/view/settings_oauth.tpl +++ b/view/settings_oauth.tpl @@ -23,8 +23,8 @@ $tabs {{ endif }} {{ endif }} {{ if $app.my }} -   -   +   +   {{ endif }} {{ endfor }} -- cgit v1.2.3 From f3b499f1192a3cc2386aa639d2f0d2fa147e911a Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Tue, 20 Dec 2011 17:17:17 +0100 Subject: quattro: more on editor --- view/jot.tpl | 6 +++--- view/theme/quattro/quattro.less | 32 +++++++++++++++++++++++++++++++- view/theme/quattro/style.css | 31 +++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 4 deletions(-) (limited to 'view') diff --git a/view/jot.tpl b/view/jot.tpl index df82f7199..00196e9d3 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -1,8 +1,8 @@
-
 
- -
+
 
+ +
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 81943c9b3..c5dfccf25 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -34,6 +34,7 @@ h4 { font-size: 1.1em } transition: all 0.2s ease-in-out; } + a, a:link { color: @Link; text-decoration: none; } a:visited { color: @LinkVisited; text-decoration: none; } a:hover {color: @LinkHover; text-decoration: underline; } @@ -461,7 +462,7 @@ section { } /* editor */ - +.jothidden { display: none; } #jot { width: 100%; @@ -536,6 +537,35 @@ section { } } + #jot-title { + border: 0px; + margin: 0px; + height: 20px; + width: 700px; + font-weight: bold; + border: 1px solid @BodyBackground; + + &:-webkit-input-placeholder { + font-weight: normal; + } + + &:-moz-placeholder { + font-weight: normal; + } + + &:hover { border: 1px solid @CommentBoxEmptyBorderColor } + &:focus { border: 1px solid @CommentBoxEmptyBorderColor } + } + + #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; + } + } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 0ba05b8ac..6d3ebc62e 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -787,6 +787,9 @@ section { color: #ffffff; } /* editor */ +.jothidden { + display: none; +} #jot { width: 100%; margin: 0px 2em 20px 0px; @@ -863,6 +866,34 @@ section { background-color: #bdcdd4; color: #666666; } +#jot #jot-title { + border: 0px; + margin: 0px; + height: 20px; + width: 700px; + font-weight: bold; + border: 1px solid #ffffff; +} +#jot #jot-title:-webkit-input-placeholder { + font-weight: normal; +} +#jot #jot-title:-moz-placeholder { + font-weight: normal; +} +#jot #jot-title:hover { + border: 1px solid #999999; +} +#jot #jot-title:focus { + border: 1px solid #999999; +} +#jot #character-counter { + width: 80px; + float: right; + text-align: right; + height: 20px; + line-height: 20px; + padding-right: 20px; +} /** buttons **/ /*input[type="submit"] { border: 0px; -- cgit v1.2.3 From bf00e4dded7dd90443eafb8fc1c15b82ce723867 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 21 Dec 2011 17:36:42 +0100 Subject: quattro: more on editor --- view/jot.tpl | 1 + view/theme/quattro/quattro.less | 10 ++++++++++ view/theme/quattro/style.css | 12 ++++++++++++ 3 files changed, 23 insertions(+) (limited to 'view') diff --git a/view/jot.tpl b/view/jot.tpl index 00196e9d3..07add78ba 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -27,6 +27,7 @@
    • +
    diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index c5dfccf25..d05acf76a 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -535,6 +535,16 @@ section { color: @JotSubmitOverText; } } + li.loading { + float: right; + background-color: @Grey1; + width: 20px; + vertical-align: center; + text-align: center; + img { margin-top: 10px; } + border-top: 2px solid @JotToolsBorderColor; + height: 38px; + } } #jot-title { diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 6d3ebc62e..948a7cb04 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -866,6 +866,18 @@ section { background-color: #bdcdd4; color: #666666; } +#jot #jot-tools li.loading { + float: right; + background-color: #ffffff; + width: 20px; + vertical-align: center; + text-align: center; + border-top: 2px solid #9eabb0; + height: 38px; +} +#jot #jot-tools li.loading img { + margin-top: 10px; +} #jot #jot-title { border: 0px; margin: 0px; -- cgit v1.2.3 From 0b4535e6daacaf7eea67e3c4404b9ac889dbddf0 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 22 Dec 2011 11:24:34 +0100 Subject: quattro: more on editor --- view/jot.tpl | 14 ++++---- view/theme/duepuntozero/jot.tpl | 2 +- view/theme/loozah/jot.tpl | 77 +++++++++++++++++++++++++++++++++++++++++ view/theme/quattro/colors.less | 2 ++ view/theme/quattro/quattro.less | 2 +- 5 files changed, 88 insertions(+), 9 deletions(-) create mode 100644 view/theme/loozah/jot.tpl (limited to 'view') diff --git a/view/jot.tpl b/view/jot.tpl index 07add78ba..e20d17b22 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -16,13 +16,13 @@