Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

backport design change #40

Merged
merged 1 commit into from
Jun 10, 2016
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/files_sharing/templates/settings-personal.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class='js-gs-share social-gnu'>
<div class="hidden" id="oca-files-sharing-add-to-your-website-expanded">
<p style="margin: 10px 0">
<a target="_blank" href="<?php p($_['reference']); ?>"
style="padding:10px;background-color:#1d2d44;color:#fff;border-radius:3px;padding-left:4px;">
style="padding:10px;background-color:#0082c9;color:#fff;border-radius:3px;padding-left:4px;">
<img src="<?php p($_['owncloud_logo_path']); ?>"
style="width:50px;position:relative;top:8px;">
<?php p($l->t('Share with me via ownCloud')); ?>
Expand All @@ -64,7 +64,7 @@ class='js-gs-share social-gnu'>
<p>
<?php p($l->t('HTML Code:')); ?>
<xmp><a target="_blank" href="<?php p($_['reference']); ?>"
style="padding:10px;background-color:#1d2d44;color:#fff;border-radius:3px;padding-left:4px;">
style="padding:10px;background-color:#0082c9;color:#fff;border-radius:3px;padding-left:4px;">
<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL($_['owncloud_logo_path'])); ?>"
style="width:50px;position:relative;top:8px;">
<?php p($l->t('Share with me via ownCloud')); ?>
Expand Down
15 changes: 10 additions & 5 deletions core/css/header.css
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
z-index: 2000;
height: 45px;
line-height: 2.5em;
background-color: #1d2d44;
background-color: #0082c9;
box-sizing: border-box;
}

Expand Down Expand Up @@ -80,7 +80,7 @@
#header .logo-icon {
/* display logo so appname can be shown next to it */
display: inline-block;
background-image: url(../img/logo-icon.svg);
background-image: url('../img/logo-icon.svg');
background-repeat: no-repeat;
width: 62px;
height: 34px;
Expand Down Expand Up @@ -291,7 +291,7 @@

#settings {
float: right;
color: #bbb;
color: #ddd;
cursor: pointer;
}
#expand {
Expand Down Expand Up @@ -324,17 +324,22 @@
top: 45px;
z-index: 2000;
display: none;
background-color: rgba(0, 0, 0, .97);
background: rgb(255, 255, 255);
border: 1px solid rgb(204, 204, 204);
box-shadow: 0 1px 10px rgba(50, 50, 50, .7);
border-radius: 3px;
border-top-left-radius: 0;
border-top-right-radius: 0;
box-sizing: border-box;
}
#expanddiv:after {
border-color: rgba(0, 0, 0, 0);
border-bottom-color: rgba(255, 255, 255, 1);
}
#expanddiv a {
display: block;
height: 40px;
color: #fff;
color: #000;
padding: 4px 12px 0;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
opacity: .7;
Expand Down
8 changes: 4 additions & 4 deletions core/css/inputs.css
Original file line number Diff line number Diff line change
Expand Up @@ -234,19 +234,19 @@ input:disabled+label, input:disabled:hover+label, input:disabled:focus+label {

/* Primary action button, use sparingly */
.primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary {
border: 1px solid #1d2d44;
background-color: #35537a;
border: 1px solid #0082c9;
background-color: #00a2e9;
color: #ddd;
}
.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,
.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {
background-color: #304d76;
background-color: #0092d9;
color: #fff;
}
.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active,
.primary:disabled, input[type="submit"].primary:disabled, input[type="button"].primary:disabled, button.primary:disabled, .button.primary:disabled,
.primary:disabled:hover, input[type="submit"].primary:disabled:hover, input[type="button"].primary:disabled:hover, button.primary:disabled:hover, .button.primary:disabled:hover,
.primary:disabled:focus, input[type="submit"].primary:disabled:focus, input[type="button"].primary:disabled:focus, button.primary:disabled:focus, .button.primary:disabled:focus {
background-color: #1d2d44;
background-color: #00a2e9;
color: #bbb;
}
12 changes: 6 additions & 6 deletions core/css/jquery-ui-fixes.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
color: #333333;
}
.ui-widget-header {
border: 1px solid #1d2d44;
background: #1d2d44 url(images/ui-bg_flat_35_1d2d44_40x100.png) 50% 50% repeat-x;
border: 1px solid #0082c9;
background: #0082c9;
color: #ffffff;
}
.ui-widget-header a {
Expand Down Expand Up @@ -59,15 +59,15 @@
.ui-state-active,
.ui-widget-content .ui-state-active,
.ui-widget-header .ui-state-active {
border: 1px solid #1d2d44;
background: #f8f8f8 url(images/ui-bg_glass_100_f8f8f8_1x400.png) 50% 50% repeat-x;
border: 1px solid #0082c9;
background: #f8f8f8 url('images/ui-bg_glass_100_f8f8f8_1x400.png') 50% 50% repeat-x;
font-weight: bold;
color: #1d2d44;
color: #0082c9;
}
.ui-state-active a,
.ui-state-active a:link,
.ui-state-active a:visited {
color: #1d2d44;
color: #0082c9;
}

/* Interaction Cues
Expand Down
14 changes: 7 additions & 7 deletions core/css/styles.css
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,11 @@ body {

#body-login {
text-align: center;
background: #1d2d44; /* Old browsers */
background: -moz-linear-gradient(top, #35537a 0%, #1d2d44 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#35537a), color-stop(100%,#1d2d44)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #35537a 0%,#1d2d44 100%); /* Chrome10+,Safari5.1+ */
background: linear-gradient(top, #35537a 0%,#1d2d44 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#35537a', endColorstr='#1d2d44',GradientType=0 ); /* IE6-9 */
background-color: #0082c9;
background-image: url('../img/background.jpg');
background-position: 50% 50%;
background-repeat: no-repeat;
background-size: cover;
}

.float-spinner {
Expand Down Expand Up @@ -109,7 +108,8 @@ body {
width: 155px;
max-width: 50%;
cursor: text;
background-color: #112;
background-color: transparent;
border: 1px solid rgba(255, 255, 255, .5);
}

/* CONTENT ------------------------------------------------------------------ */
Expand Down
Binary file modified core/img/actions/checkbox-checked.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions core/img/actions/checkbox-checked.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/img/actions/logout.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions core/img/actions/logout.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/img/actions/radio-checked.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions core/img/actions/radio-checked.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added core/img/background.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion core/img/favicon-mask.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/img/favicon-touch.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions core/img/favicon-touch.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified core/img/favicon.ico
Binary file not shown.
Binary file modified core/img/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading