infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Fix the drive button in the homepage and a:hover in dropdown

pull/1/head
yflory 2017-02-10 11:21:10 +01:00
parent 8eec7ec7c8
commit 73e9effd32
8 changed files with 61 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
customize.dist/index.html
View File

@ -82,11 +82,11 @@
<button class="btn btn-secondary login half first" data-localization="login_login"></button> <button class="btn btn-success register half" data-localization="login_register"></button>
<p class="separator" data-localization="login_orNoLogin"></p>
<p id="buttons" class="buttons"></p>
<p class="driveLink"><a class="nologin" href="/drive/" data-localization="login_nologin"></a></p>
<p class="driveLink"><a class="gotodrive" href="/drive/" data-localization="login_nologin"></a></p>
</div>
<div id="loggedIn" class="hidden">
<p id="loggedInHello"></p>
<p><button class="btn btn-primary nologin" data-localization="login_accessDrive"></button></p>
<p><button class="btn btn-primary gotodrive" data-localization="login_accessDrive"></button></p>
<p><button id="loggedInLogOut" class="btn btn-secondary" data-localization="logoutButton"></button></p>
</div>
</div>

47
customize.dist/main.css
View File

@ -333,17 +333,17 @@
height: 100px;
}
/* The container <div> - needed to position the dropdown content */
.dropdown-bar {
.cp .dropdown-bar {
position: relative;
display: inline-block;
}
.dropdown-bar .fa {
.cp .dropdown-bar .fa {
font-family: FontAwesome;
}
.dropdown-bar button .fa-caret-down {
.cp .dropdown-bar button .fa-caret-down {
margin-left: 5px;
}
.dropdown-bar .dropdown-bar-content {
.cp .dropdown-bar .dropdown-bar-content {
display: none;
position: absolute;
background-color: #f9f9f9;
@ -353,13 +353,13 @@
max-height: 300px;
overflow-y: auto;
}
.dropdown-bar .dropdown-bar-content.left {
.cp .dropdown-bar .dropdown-bar-content.left {
right: 0;
}
.dropdown-bar .dropdown-bar-content:hover {
.cp .dropdown-bar .dropdown-bar-content:hover {
display: block;
}
.dropdown-bar .dropdown-bar-content a {
.cp .dropdown-bar .dropdown-bar-content a {
color: black !important;
padding: 5px 16px;
text-decoration: none;
@ -372,30 +372,31 @@
float: none;
text-align: left;
}
.dropdown-bar .dropdown-bar-content a:hover {
.cp .dropdown-bar .dropdown-bar-content a:hover {
background-color: #f1f1f1;
color: black !important;
}
.dropdown-bar .dropdown-bar-content hr {
.cp .dropdown-bar .dropdown-bar-content hr {
margin: 5px 0px;
height: 1px;
background: #bbb;
}
.dropdown-bar .dropdown-bar-content p {
.cp .dropdown-bar .dropdown-bar-content p {
min-width: 160px;
padding: 5px;
margin: 0;
white-space: normal;
text-align: left;
}
.dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users {
.cp .dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users {
text-align: baseline;
}
.dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .yourself,
.dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .anonymous,
.dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .viewer {
.cp .dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .yourself,
.cp .dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .anonymous,
.cp .dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .viewer {
font-style: italic;
}
.dropdown-bar .dropdown-bar-content p h2 {
.cp .dropdown-bar .dropdown-bar-content p h2 {
font-weight: bold;
text-align: center;
background-color: #EEEEEE;
@ -453,7 +454,7 @@
color: #41b7d8;
}
#cryptpadTopBar .right a:hover {
color: #279ebf !important;
color: #279ebf;
text-decoration: underline;
}
#cryptpadTopBar .right a:visited {
@ -472,7 +473,7 @@
color: #41b7d8;
}
.cp footer a:hover {
color: #279ebf !important;
color: #279ebf;
}
.cp footer li:first-child {
font-size: 1.2em;
@ -565,7 +566,7 @@ html.cp,
text-decoration: none;
}
.cp a:hover {
color: #279ebf !important;
color: #279ebf;
}
.cp a:visited {
color: #41b7d8;
@ -891,6 +892,16 @@ html.cp,
.cp #main_other #userForm p.buttons .dropdown-bar button .fa {
float: right;
}
.cp #main #userForm p.buttons .dropdown-bar a,
.cp #main_other #userForm p.buttons .dropdown-bar a {
color: black;
}
.cp #main #userForm p.buttons .dropdown-bar a:hover,
.cp #main_other #userForm p.buttons .dropdown-bar a:hover,
.cp #main #userForm p.buttons .dropdown-bar a :visited,
.cp #main_other #userForm p.buttons .dropdown-bar a :visited {
color: black !important;
}
.cp #main #userForm p.separator,
.cp #main_other #userForm p.separator {
margin: 5px 0 15px 0;

3
customize.dist/main.js
View File

@ -103,6 +103,9 @@ define([
sessionStorage.register = 1;
document.location.href = '/user/';
});
$('button.gotodrive').click(function (e) {
document.location.href = '/drive/';
});
var $passwd = $('#password');
$passwd.on('keyup', function (e) {

4
customize.dist/src/fragments/index.html
View File

@ -15,11 +15,11 @@
<button class="btn btn-secondary login half first" data-localization="login_login"></button> <button class="btn btn-success register half" data-localization="login_register"></button>
<p class="separator" data-localization="login_orNoLogin"></p>
<p id="buttons" class="buttons"></p>
<p class="driveLink"><a class="nologin" href="/drive/" data-localization="login_nologin"></a></p>
<p class="driveLink"><a class="gotodrive" href="/drive/" data-localization="login_nologin"></a></p>
</div>
<div id="loggedIn" class="hidden">
<p id="loggedInHello"></p>
<p><button class="btn btn-primary nologin" data-localization="login_accessDrive"></button></p>
<p><button class="btn btn-primary gotodrive" data-localization="login_accessDrive"></button></p>
<p><button id="loggedInLogOut" class="btn btn-secondary" data-localization="logoutButton"></button></p>
</div>
</div>

6
customize.dist/src/less/cryptpad.less
View File

@ -425,6 +425,12 @@ body.html {
float: right;
}
}
a {
color: black;
&:hover, :visited {
color: black !important;
}
}
display: block;
}
}

3
customize.dist/src/less/dropdown.less
View File

@ -1,6 +1,6 @@
/* The container <div> - needed to position the dropdown content */
.dropdown-bar {
.cp .dropdown-bar {
position: relative;
display: inline-block;
@ -55,6 +55,7 @@
&:hover {
background-color: #f1f1f1;
color: black !important;
}
}

2
customize.dist/src/less/variables.less
View File

@ -27,7 +27,7 @@
// links
@cp-link: @cp-light-blue;
@cp-link-visited: @cp-light-blue;
@cp-link-hover: darken(@cp-light-blue, 10%) !important;
@cp-link-hover: darken(@cp-light-blue, 10%);
// alertify things

31
customize.dist/toolbar.css
View File

@ -1,15 +1,15 @@
/* The container <div> - needed to position the dropdown content */
.dropdown-bar {
.cp .dropdown-bar {
position: relative;
display: inline-block;
}
.dropdown-bar .fa {
.cp .dropdown-bar .fa {
font-family: FontAwesome;
}
.dropdown-bar button .fa-caret-down {
.cp .dropdown-bar button .fa-caret-down {
margin-left: 5px;
}
.dropdown-bar .dropdown-bar-content {
.cp .dropdown-bar .dropdown-bar-content {
display: none;
position: absolute;
background-color: #f9f9f9;
@ -19,13 +19,13 @@
max-height: 300px;
overflow-y: auto;
}
.dropdown-bar .dropdown-bar-content.left {
.cp .dropdown-bar .dropdown-bar-content.left {
right: 0;
}
.dropdown-bar .dropdown-bar-content:hover {
.cp .dropdown-bar .dropdown-bar-content:hover {
display: block;
}
.dropdown-bar .dropdown-bar-content a {
.cp .dropdown-bar .dropdown-bar-content a {
color: black !important;
padding: 5px 16px;
text-decoration: none;
@ -38,30 +38,31 @@
float: none;
text-align: left;
}
.dropdown-bar .dropdown-bar-content a:hover {
.cp .dropdown-bar .dropdown-bar-content a:hover {
background-color: #f1f1f1;
color: black !important;
}
.dropdown-bar .dropdown-bar-content hr {
.cp .dropdown-bar .dropdown-bar-content hr {
margin: 5px 0px;
height: 1px;
background: #bbb;
}
.dropdown-bar .dropdown-bar-content p {
.cp .dropdown-bar .dropdown-bar-content p {
min-width: 160px;
padding: 5px;
margin: 0;
white-space: normal;
text-align: left;
}
.dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users {
.cp .dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users {
text-align: baseline;
}
.dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .yourself,
.dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .anonymous,
.dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .viewer {
.cp .dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .yourself,
.cp .dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .anonymous,
.cp .dropdown-bar .dropdown-bar-content p.cryptpad-dropdown-users .viewer {
font-style: italic;
}
.dropdown-bar .dropdown-bar-content p h2 {
.cp .dropdown-bar .dropdown-bar-content p h2 {
font-weight: bold;
text-align: center;
background-color: #EEEEEE;