Skip to content
This repository has been archived by the owner on May 10, 2019. It is now read-only.

Visual updates to make secondary action links be more consistent, clean up CSS. #1428

Merged
merged 1 commit into from Apr 13, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 26 additions & 24 deletions resources/static/css/common.css
Expand Up @@ -44,6 +44,7 @@ html[xmlns] .cf {

header, section, footer {
display: block;
width: 100%;
}

ul, li {
Expand Down Expand Up @@ -84,6 +85,19 @@ a {
text-decoration: none;
}

a:hover {
color: #000;
}

a.action, #error a {
color: #549FDC;
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
}

a.action:hover, #error a:hover {
color: #58a7e7;
}

p:last-child {
margin-bottom: 0 !important;
}
Expand Down Expand Up @@ -189,10 +203,10 @@ button:hover,
button:focus,
.button:hover,
.button:focus{
color: #fff;
background-color: #76c2ff;
background-image: -moz-linear-gradient(center top , #76C2FF 50%, #37A6FF 100%);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(50%, #76C2FF), color-stop(100%, #37A6FF));

}

button.negative:hover,
Expand Down Expand Up @@ -237,16 +251,6 @@ button[disabled], .submit_disabled button, .submit_disabled .button,
opacity: .5;
}

#cancel, #back {
background-color: transparent;
color: #549FDC;
font-size: 1em;
font-weight: normal;
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
padding: 0;
}


.submit #cancel {
float: right;
margin-right: 15px;
Expand Down Expand Up @@ -280,26 +284,18 @@ header ul li {
float: left;
}

header a {
color: #222;
}

header a.home {
width: 80px;
height: 21px;
background: url("/i/icon.png") 0px 4px no-repeat;
text-indent: -9999px;
display: block;
display: inline-block;
}

footer {
color: #aaa;
}

footer a {
color: #aaa;
}

footer ul li {
display: inline-block;
float: left;
Expand All @@ -308,16 +304,13 @@ footer ul li {

footer .help {
float: right;
color: #62615F;
cursor: help;
}

.cancelVerify {
font-weight: bold;
}



#wait, #delay {
background-color: #fff;
}
Expand All @@ -340,8 +333,17 @@ footer .help {
}

#error a {
color: #549FDC;
text-decoration: underline;
}

.forgot {
color: #777;
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
font-size: 11px;
}

.forgot:hover {
color: #333;
}


2 changes: 1 addition & 1 deletion resources/static/css/m.css
Expand Up @@ -231,7 +231,7 @@
float: right;
}

#newsbanner {
.newsbanner {
margin: 115px 0 28px 0; /* put a margin-top on so that it does not go under the header */

}
Expand Down
114 changes: 63 additions & 51 deletions resources/static/css/style.css
Expand Up @@ -98,7 +98,6 @@ noscript {
}

#about {
font-family: 'Droid Serif', Georgia, serif;
font-size: 14px;
line-height: 21px;
color: #444;
Expand Down Expand Up @@ -200,22 +199,16 @@ div.steps {
}

.sumo > a {
font-weight: bold;
color: #444;
border-bottom: 1px dotted;
}

#legal {
padding: 75px 125px;
}

#newuser {
background-color: #faca33;
line-height: 32px;
border-radius: 4px;
margin-bottom: 20px;
text-align: center;
color: #626160;
text-shadow: 1px 1px 0 rgba(255,255,255,0.5);
margin: 0 0 20px 0;
height: 0;
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)";
opacity: 0;
Expand All @@ -226,10 +219,10 @@ div.steps {
-ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
opacity: 1;
-webkit-transition: all 500ms;
-moz-transition: all 500ms;
-ms-transition: all 500ms;
-o-transition: all 500ms;
transition: all 500ms;
-moz-transition: all 500ms;
-ms-transition: all 500ms;
-o-transition: all 500ms;
transition: all 500ms;
}

#manage {
Expand Down Expand Up @@ -322,13 +315,6 @@ div.steps {
font-size: 12px;
}

/*
.buttonrow > button {
width: 48px;
}
*/
.buttonrow > .edit { }

.edit .buttonrow > .edit {
display: none;
}
Expand Down Expand Up @@ -390,9 +376,9 @@ div.steps {
}

.activity button {
width: 60px;
min-width: 60px;
margin-left: 10px;
margin-right: -70px;
margin-right: -100%;

-webkit-transition: margin 0.4s ease;
-moz-transition: margin 0.4s ease;
Expand Down Expand Up @@ -430,9 +416,18 @@ button.delete {
-o-border-radius: 5px;
border-radius: 5px;

background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #EA7676), color-stop(100%, #C84343));
background-image: -moz-linear-gradient(#EA7676 0%, #C84343 100%);
background-image: -ms-linear-gradient(#EA7676 0%, #C84343 100%);
background-image: -o-linear-gradient(#EA7676 0%, #C84343 100%);
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #EA7676), color-stop(100%, #C84343));
}

button.delete:hover {
background-color: #f07979;
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f07979), color-stop(100%, #c34141));
background-image: -moz-linear-gradient(#f07979 0%, #c34141 100%);
background-image: -ms-linear-gradient(#f07979 0%, #c34141 100%);
background-image: -o-linear-gradient(#f07979 0%, #c34141 100%);
}

button.delete:active {
Expand All @@ -451,6 +446,7 @@ button.delete:active {
background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #C84343), color-stop(100%, #AA3D3D));
}


#edit_password {
margin-bottom: 10px;
display: none;
Expand Down Expand Up @@ -489,10 +485,6 @@ button.delete:active {
text-align: right;
}

#disclaimer a {
color: #549FDC;
}

h1 {
margin-bottom: 20px;
}
Expand All @@ -514,9 +506,8 @@ h1 {
padding: 0 0 0 250px;
}

#signUp .info {
color: #549FDC;
text-decoration: underline;
#signUp .tour {
border-bottom: 1px dotted #90c0db;
}

#signUp p {
Expand Down Expand Up @@ -618,11 +609,6 @@ h1 {
margin: 122px 115px;
}

#signUpFormWrap a.signUpIn {
color: #549FDC;
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
}

#signUpFormWrap a.space {
margin: 10px 20px 0;
display: inline-block;
Expand Down Expand Up @@ -686,6 +672,10 @@ h1 {
display: none;
}

.submit .remember {
float: left;
}

.enter_password #signUpForm > .password_entry, .known_secondary #signUpForm > .password_entry,
.unknown_secondary #unknown_secondary, .verify_primary #verify_primary {
display: block;
Expand All @@ -706,12 +696,6 @@ h1 {
}


a.forgot {
color: #888784;
text-shadow: 1px 1px 0 rgba(255, 255, 255, 0.5);
font-size: 11px;
}

.notifications {
list-style-type: none;
}
Expand All @@ -730,7 +714,7 @@ a.forgot {
text-align: center;
}

.notifications > .notification a, .notifications > .notification strong {
.notifications > .notification strong {
color: #222;
}

Expand Down Expand Up @@ -759,6 +743,15 @@ header ul.nav li {
}


header ul a {
padding: 4px 8px;
}

header ul a:hover {
background-color: #f4f3f0;
border-radius: 3px;
}

header a.signIn, header a.signOut {
background-color: #d1ceca;
padding: 4px 8px;
Expand All @@ -782,19 +775,30 @@ header a.signIn:hover, header a.signOut:hover {
display: inline;
}

#wrapper > header,
footer {
display: block;
width: 100%;
header, footer {
padding: 20px 0;
}

section > header {
padding: 0;
}

footer {
position: absolute;
bottom: 0;
}

#newsbanner {
footer a {
color: #aaa;
border-bottom: 1px dotted #ccc;
}

footer a:hover {
color: #777;
}


.newsbanner {
margin-top: 60px; /* put a margin-top on so that it does not go under the header */
background-color: #faca33;
line-height: 32px;
Expand All @@ -804,8 +808,16 @@ footer {
color: #626160;
text-shadow: 1px 1px 0 rgba(255,255,255,0.5);
-webkit-transition: all 500ms;
-moz-transition: all 500ms;
-ms-transition: all 500ms;
-o-transition: all 500ms;
transition: all 500ms;
-moz-transition: all 500ms;
-ms-transition: all 500ms;
-o-transition: all 500ms;
transition: all 500ms;
}

.newsbanner a {
border-bottom: 1px dotted;
}

.newsbanner a:hover {
color: #000;
}
4 changes: 2 additions & 2 deletions resources/static/dialog/controllers/authenticate.js
Expand Up @@ -18,7 +18,7 @@ BrowserID.Modules.Authenticate = (function() {
dom = bid.DOM,
lastEmail = "",
addressInfo,
hints = ["newuser","forgot","returning","start","addressInfo"];
hints = ["newuser","returning","start","addressInfo"];

function getEmail() {
return helpers.getAndValidateEmail("#email");
Expand Down Expand Up @@ -161,7 +161,7 @@ BrowserID.Modules.Authenticate = (function() {
tos_url: options.tosURL
});

$(".newuser,.forgot,.returning,.start").hide();
$(".newuser,.returning,.start").hide();

self.bind("#email", "keyup", emailKeyUp);
self.click("#forgotPassword", forgotPassword);
Expand Down