2 commits - skins/chameleon

Thomas Brüderli bruederli at kolabsys.com
Tue Jan 13 14:45:05 CET 2015


 skins/chameleon/images/addcontact.png      |binary
 skins/chameleon/images/contactgroup.png    |binary
 skins/chameleon/images/contactpic.png      |binary
 skins/chameleon/images/contactpic_32px.png |binary
 skins/chameleon/images/contactpic_48px.png |binary
 skins/chameleon/images/listicons.png       |binary
 skins/chameleon/images/quota.png           |binary
 skins/chameleon/images/read.png            |binary
 skins/chameleon/images/splitter.png        |binary
 skins/chameleon/images/write.png           |binary
 skins/chameleon/styles.less                |  123 ++++++++++++++++++++++-------
 skins/chameleon/templates/login.html       |    6 -
 12 files changed, 99 insertions(+), 30 deletions(-)

New commits:
commit 44386e0805ae23f4046d82e2842cda1cede3529f
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Jan 13 14:42:58 2015 +0100

    Re-style login form (#4191)

diff --git a/skins/chameleon/styles.less b/skins/chameleon/styles.less
index 6557254..83a1350 100644
--- a/skins/chameleon/styles.less
+++ b/skins/chameleon/styles.less
@@ -35,42 +35,103 @@ body.login #header {
 
 /*** basic page layout ***/
 
+#login-form {
+	width: 560px;
+}
+
+#login-form .login-title {
+	width: auto;
+	margin: 0 80px 20px 80px;
+	font-weight: normal;
+	font-size: 18px;
+	padding-left: 24px;
+	text-transform: uppercase;
+	color: @title-text;
+}
+
 #login-form .box-inner {
-	padding-top: 40px;
-	background: #fff;
-	border: none;
+	width: auto;
+	margin: 0 80px;
+	padding: 24px;
+	background: @header-background;
+	border: 0;
 	border-radius: 0;
+	box-shadow: none;
+	-webkit-box-shadow: none;
 }
 
-#login-form .box-bottom {
-	background: transparent;
+#login-form form table,
+#login-form form tbody {
+	display: block;
+	width: 100%;
+}
+
+#login-form table tr,
+#login-form table td {
+	width: auto;
+	display: block;
+}
+
+#login-form table tr {
+	padding: 0;
+	margin-bottom: 15px;
+}
+
+#login-form table td.input {
+	padding: 0;
+	margin: 0;
+	width: 100%;
+}
+
+#login-form td.input input[type="text"],
+#login-form td.input input[type="password"] {
+	padding: 8px;
+	box-sizing: border-box;
+	font-size: 14px;
 }
 
 #login-form td.title {
-	color: @main-color;
+	color: @text-color;
 	text-shadow: none;
 	font-weight: bold;
+	text-align: left;
+	text-transform: uppercase;
+	margin-bottom: 4px;
 }
 
 #login-form input.button {
+	width: 100%;
+	padding: 10px 0;
 	border: none;
 	text-shadow: none;
 	color: #fff;
 	box-shadow: none;
+	-webkit-box-shadow: none;
 	background: @main-color;
+	box-sizing: border-box;
+	font-size: 14px;
 }
 
 #login-form input.button:hover,
 #login-form input.button:focus {
 	box-shadow: none;
 	-webkit-box-shadow: none;
+	background: darken(@main-color, 7%);
+}
+
+#login-form input.button:active {
+	color: #fff;
+	background: darken(@main-color, 12%);
 }
 
 #login-form p.formbuttons {
-	margin-left: 20%;
-	padding-left: 8px;
-	margin-top: 5px;;
-	text-align: left;
+	margin: 0;
+	margin-top: 24px;
+}
+
+#login-form .box-bottom {
+	background: none;
+	margin-top: 10px;
 }
 
 .topgradient {
@@ -2054,16 +2115,6 @@ input.button.delete:hover {
 	background-image: url(images/listicons.png) !important;
 }
 
-#directorylist li.addressbook a,
-#directorylist li.addressbook.selected > div a {
-	background-position: 6px -765px;
-}
-
-#directorylist ul li.addressbook > div a,
-#directorylist ul li.addressbook.selected > div a {
-	background-position: 32px -765px;
-}
-
 #directorylist ul li.contactgroup a,
 #directorylist li.contactgroup.selected a {
 	background-position: 32px -1578px;
diff --git a/skins/chameleon/templates/login.html b/skins/chameleon/templates/login.html
index 23d9266..38b6ecc 100644
--- a/skins/chameleon/templates/login.html
+++ b/skins/chameleon/templates/login.html
@@ -7,12 +7,14 @@
 </head>
 <body class="login">
 
-<h1 class="voice"><roundcube:object name="productname" /> <roundcube:label name="login" /></h1>
-
 <div id="header">
 	<roundcube:object name="logo" src="/images/kolab_logo.png" id="toplogo" alt="Logo" />
 </div>
 <div id="login-form">
+
+
+<h1 class="login-title"><roundcube:object name="productname" /> <roundcube:label name="login" /></h1>
+
 <div class="box-inner" role="main">
 
 <roundcube:form name="form" method="post">


commit 4b8bdac4a9ce01368cbd46b8c4b4c78486931d22
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Tue Jan 13 12:01:30 2015 +0100

    Apply new main color to remaining images (#4047); add image for contact groups (#4138)

diff --git a/skins/chameleon/images/addcontact.png b/skins/chameleon/images/addcontact.png
index 75bcc6a..8be8d03 100644
Binary files a/skins/chameleon/images/addcontact.png and b/skins/chameleon/images/addcontact.png differ
diff --git a/skins/chameleon/images/contactgroup.png b/skins/chameleon/images/contactgroup.png
new file mode 100644
index 0000000..d6d08a4
Binary files /dev/null and b/skins/chameleon/images/contactgroup.png differ
diff --git a/skins/chameleon/images/contactpic.png b/skins/chameleon/images/contactpic.png
index 74dd3f4..3fcc825 100644
Binary files a/skins/chameleon/images/contactpic.png and b/skins/chameleon/images/contactpic.png differ
diff --git a/skins/chameleon/images/contactpic_32px.png b/skins/chameleon/images/contactpic_32px.png
index 2ee096f..9258bd0 100644
Binary files a/skins/chameleon/images/contactpic_32px.png and b/skins/chameleon/images/contactpic_32px.png differ
diff --git a/skins/chameleon/images/contactpic_48px.png b/skins/chameleon/images/contactpic_48px.png
index 417cdfe..b32b64b 100644
Binary files a/skins/chameleon/images/contactpic_48px.png and b/skins/chameleon/images/contactpic_48px.png differ
diff --git a/skins/chameleon/images/listicons.png b/skins/chameleon/images/listicons.png
index 493b460..4dc95f5 100644
Binary files a/skins/chameleon/images/listicons.png and b/skins/chameleon/images/listicons.png differ
diff --git a/skins/chameleon/images/quota.png b/skins/chameleon/images/quota.png
index e4cae15..85e4999 100644
Binary files a/skins/chameleon/images/quota.png and b/skins/chameleon/images/quota.png differ
diff --git a/skins/chameleon/images/read.png b/skins/chameleon/images/read.png
index 778fcbd..91f7bbe 100644
Binary files a/skins/chameleon/images/read.png and b/skins/chameleon/images/read.png differ
diff --git a/skins/chameleon/images/splitter.png b/skins/chameleon/images/splitter.png
index b7acc7f..34665ed 100644
Binary files a/skins/chameleon/images/splitter.png and b/skins/chameleon/images/splitter.png differ
diff --git a/skins/chameleon/images/write.png b/skins/chameleon/images/write.png
index c245d62..cbe65b9 100644
Binary files a/skins/chameleon/images/write.png and b/skins/chameleon/images/write.png differ
diff --git a/skins/chameleon/styles.less b/skins/chameleon/styles.less
index 0a060b0..6557254 100644
--- a/skins/chameleon/styles.less
+++ b/skins/chameleon/styles.less
@@ -1202,11 +1202,15 @@ body.iframe .footerleft.floating:before,
 	padding-left: 2px;
 }
 
-#contacttabs {
+#contacttabs fieldset.ui-tabs-panel {
 	margin-left: - at box-padding;
 	margin-right: - at box-padding;
 }
 
+#contacttabs .tabsbar.ui-tabs-nav {
+	margin-bottom: 0;
+}
+
 #contacttabs p.addfield {
 	margin-left: @box-padding;
 }
@@ -1854,6 +1858,10 @@ input.button.delete:hover {
 	height: 45px;
 }
 
+.ui-dialog-content .ui-tabs .tabsbar.ui-tabs-nav {
+	margin-bottom: 10px;
+}
+
 .ui-tabs .ui-tabs-nav li,
 .ui-tabs .ui-tabs-nav li.tablink a {
 	background: #ededed;
@@ -1881,10 +1889,14 @@ input.button.delete:hover {
 }
 
 .ui-tabs .tabsbar.ui-tabs-nav {
-	margin-bottom: 0;
 	border-radius: 0;
 }
 
+.boxcontent .ui-tabs .tabsbar.ui-tabs-nav {
+	margin-left: - at box-padding;
+	margin-right: - at box-padding;
+}
+
 .ui-datepicker {
 	box-shadow: none;
 	border: 1px solid #ededed;
@@ -2176,16 +2188,20 @@ input.button.delete:hover {
 	background-position: 4px -1602px;
 }
 
-#contacts-table td.contactgroup,
-#contacts-table tr.selected td.contactgroup,
-#contacts-table .contactgroup td.name {
-	background-position: 4px -1553px;
-}
-
 #contacts-table .contact.selected td.name {
 	background-position: 4px -1625px;
 }
 
+#contacts-table td.contact.group,
+#contacts-table .contact.group td.name {
+	background-position: 4px -1552px;
+}
+
+#contacts-table tr.selected td.contact.group,
+#contacts-table.focus .group.selected.focused td.name {
+	background-position: 4px -1578px;
+}
+
 #sections-table #rcmrowgeneral.selected .section,
 #sections-table #rcmrowgeneral .section {
 	background-position: 4px -570px;




More information about the commits mailing list