Skip to content
This repository has been archived by the owner on Oct 6, 2021. It is now read-only.

Commit

Permalink
Polish up the UI/UX changes to Bridge.
Browse files Browse the repository at this point in the history
  • Loading branch information
@paragonie-security
paragonie-security committed Aug 26, 2016
1 parent dd06930 commit efffb34
Show file tree
Hide file tree
Showing 5 changed files with 96 additions and 42 deletions.
3 changes: 3 additions & 0 deletions src/Cabin/Bridge/Landing/Account.php
View file
Expand Up @@ -68,6 +68,7 @@ class Account extends LandingGear
public function airshipLand()
{
parent::airshipLand();
$this->storeLensVar('showmenu', true);
$this->acct = $this->blueprint('UserAccounts');
}

Expand Down Expand Up @@ -133,6 +134,7 @@ public function login()
// You're already logged in!
\Airship\redirect($this->airship_cabin_prefix);
}
$this->storeLensVar('showmenu', false);
$post = $this->post(new LoginFilter());
if (!empty($post)) {
$this->processLogin($post);
Expand Down Expand Up @@ -274,6 +276,7 @@ public function recoverAccount(string $token = '')
if ($this->isLoggedIn()) {
\Airship\redirect($this->airship_cabin_prefix);
}
$this->storeLensVar('showmenu', false);
$enabled = $this->config('password-reset.enabled');
if (empty($enabled)) {
\Airship\redirect($this->airship_cabin_prefix);
Expand Down
4 changes: 4 additions & 0 deletions src/Cabin/Bridge/Landing/IndexPage.php
View file
Expand Up @@ -28,6 +28,7 @@ public function announce()
if (!$this->isLoggedIn()) {
\Airship\redirect($this->airship_cabin_prefix);
}
$this->storeLensVar('showmenu', true);
if (!$this->can('create')) {
\Airship\redirect($this->airship_cabin_prefix);
}
Expand Down Expand Up @@ -59,6 +60,7 @@ public function announce()
public function index()
{
if ($this->isLoggedIn()) {
$this->storeLensVar('showmenu', true);
$author_bp = $this->blueprint('Author');
$announce_bp = $this->blueprint('Announcements');
$blog_bp = $this->blueprint('Blog');
Expand Down Expand Up @@ -88,6 +90,7 @@ public function index()
)
]);
} else {
$this->storeLensVar('showmenu', false);
$this->lens('login');
}
}
Expand Down Expand Up @@ -124,6 +127,7 @@ public function error()
public function helpPage()
{
if ($this->isLoggedIn()) {
$this->storeLensVar('showmenu', true);
//
$cabins = $this->getCabinNamespaces();

Expand Down
1 change: 1 addition & 0 deletions src/Cabin/Bridge/Landing/init_gear.php
View file
Expand Up @@ -68,6 +68,7 @@ class LoggedInUsersOnly extends LandingGear
public function airshipLand()
{
parent::airshipLand();
$this->storeLensVar('showmenu', true);

if (!$this->isLoggedIn()) {
// You need to log in first!
Expand Down
34 changes: 11 additions & 23 deletions src/Cabin/Bridge/Lens/base.twig
View file
Expand Up @@ -14,34 +14,22 @@
#}{{ active_link|json_encode|e('html_attr') }}{#
#}{% endif %}"{#
#}>{% block body %}
<div id="site-wrapper">
<div id="site-wrapper" class="bridge-body-site-wrapper{% if not showmenu %} bridge-no-menu{% endif %}">
<header>{% block header %}
{% include cargo("header") %}
{% endblock %}</header>
{% if showmenu %}{#
#}<div id="main-wrapper">
<div id="leftmenu">{% block leftmenu %}

{% endblock %}</div>
<div id="rightside">
{% endif %}
<div id="content">{#
#}{% if SETTINGS['sandwich_content'] %}<div class="content-sandwich">{% endif %}{#
#}{% block content %}<div id="bridge_content">
<div id="bridge_table">
{% if announcement %}<div id="announcement">{{ announcement }}</div>{% endif %}
<div id="bridge_left">
{% include cargo("bridge_menu") %}
</div>
<div id="bridge_main">{% block main %}{% endblock %}</div>
</div>
</div>{% endblock %}</div>{#
#}{% if SETTINGS['sandwich_content'] %}</div>{% endif %}{#
#}
{% if showmenu %}
<div id="content">{#
#}{% if SETTINGS['sandwich_content'] %}<div class="content-sandwich">{% endif %}{#
#}{% block content %}<div id="bridge_content">
<div id="bridge_table">
{% if announcement %}<div id="announcement">{{ announcement }}</div>{% endif %}
<div id="bridge_left">
{% include cargo("bridge_menu") %}
</div>
<div id="bridge_main">{% block main %}{% endblock %}</div>
</div>
{% endif %}
</div>{% endblock %}</div>{#
#}{% if SETTINGS['sandwich_content'] %}</div>{% endif %}
</div>
<footer id="bridge_footer">{% block footer %}
{% include cargo("footer") %}
Expand Down
96 changes: 77 additions & 19 deletions src/Motifs/paragonie/airship-classic/public/style.css
View file
Expand Up @@ -7,41 +7,96 @@ body {
color: #282828;
}
#site-wrapper {
display: block;
min-height: 100%;
margin-bottom: -37px;
}
.bridge-body-site-wrapper .header_wrap {
background-color: transparent;
}
.bridge-body-site-wrapper {
background-color: #242424;
background-image: -webkit-linear-gradient(
top,
rgba(255, 255, 255, 0.33) 0%,
rgba(255, 255, 255, 0) 100%
rgba(0, 0, 0, 0) 0%,
rgba(0, 0, 0, 0.5) 100%
), -webkit-linear-gradient(
top,
rgba(255, 255, 255, 0.1) 0px,
rgba(255, 255, 255, 0) 3rem
), -webkit-linear-gradient(
left,
rgba(255, 255, 255, 0.1) 0px,
rgba(255, 255, 255, 0) 200px
);
background-image: -moz-linear-gradient(
top,
rgba(255, 255, 255, 0.33) 0%,
rgba(255, 255, 255, 0) 100%
rgba(0, 0, 0, 0) 0%,
rgba(0, 0, 0, 0.5) 100%
), -moz-linear-gradient(
top,
rgba(255, 255, 255, 0.1) 0px,
rgba(255, 255, 255, 0) 3rem
), -moz-linear-gradient(
left,
rgba(255, 255, 255, 0.1) 0px,
rgba(255, 255, 255, 0) 200px
);
background-image: -ms-linear-gradient(
top,
rgba(255, 255, 255, 0.33) 0%,
rgba(255, 255, 255, 0) 100%
rgba(0, 0, 0, 0) 0%,
rgba(0, 0, 0, 0.5) 100%
), -ms-linear-gradient(
top,
rgba(255, 255, 255, 0.1) 0px,
rgba(255, 255, 255, 0) 3rem
), -ms-linear-gradient(
left,
rgba(255, 255, 255, 0.1) 0px,
rgba(255, 255, 255, 0) 200px
);
background-image: -o-linear-gradient(
top,
rgba(255, 255, 255, 0.33) 0%,
rgba(255, 255, 255, 0) 100%
rgba(0, 0, 0, 0) 0%,
rgba(0, 0, 0, 0.5) 100%
), -o-linear-gradient(
top,
rgba(255, 255, 255, 0.1) 0px,
rgba(255, 255, 255, 0) 3rem
), -o-linear-gradient(
left,
rgba(255, 255, 255, 0.1) 0px,
rgba(255, 255, 255, 0) 200px
);
background-image: linear-gradient(
top,
rgba(255, 255, 255, 0.33) 0%,
rgba(255, 255, 255, 0) 100%
rgba(0, 0, 0, 0) 0%,
rgba(0, 0, 0, 0.5) 100%
), linear-gradient(
top,
rgba(255, 255, 255, 0.1) 0px,
rgba(255, 255, 255, 0) 3rem
), linear-gradient(
left,
rgba(255, 255, 255, 0.1) 0px,
rgba(255, 255, 255, 0) 200px
);
display: block;
min-height: 100%;
margin-bottom: -37px;
}
#hull-header-icon {
height: 64px;
}
#bridge-header-icon {
height: 38px;
}
.bridge-no-menu {
background: #dfe4e7;
}
.bridge-no-menu .header_wrap {
background: #181818;
}
.bridge-no-menu #content {
padding-top: 1rem;
}
#content {
height: 100%;
padding-left: 0;
Expand Down Expand Up @@ -88,6 +143,10 @@ a:active, a:hover {
color: #E4E4F8;
}
#hull-header-icon,
#bridge-header-icon {
transform: rotate(-30deg);
}
#hull-header-icon,
#hull-header-image-link {
border-radius: 32px;
}
Expand Down Expand Up @@ -160,7 +219,7 @@ nav {
}
nav a,
nav a:visited {
color: #A8B5EF;
color: #FFFFFF;
font-weight: bold;
text-decoration: none;
}
Expand All @@ -170,7 +229,7 @@ nav ul.navigation > li {
margin: 0;
}
nav ul.navigation > li:hover a {
color: #fff;
color: #A8B5EF;
}
#blog-header {
padding: 1em 0.5em;
Expand Down Expand Up @@ -510,7 +569,6 @@ a.pure-button-tertiary:hover,
background-color: #ddd;
}
#bridge_left {
background-color: #181818;
line-height: 1.5;
padding-right: 1em;
}
Expand All @@ -535,7 +593,6 @@ a:hover .bridge-icon {
color: #090;
}
#bridge_table {
background-color: #181818;
margin-bottom: 0;
height: 100%;
}
Expand Down Expand Up @@ -572,6 +629,7 @@ a:hover .bridge-icon {
background-color: #eff4f7;
padding-bottom: 1rem;
border-radius: 2rem 0 0 0;
box-shadow: #000 -1px -1px 1ex;
}
.bridge-main-link a {
color: #ddd !important;
Expand Down Expand Up @@ -2137,13 +2195,13 @@ h2#comments {
margin-bottom: 0.5rem;
}
a.bridge-left-active {
color: #A8B5EF !important;
color: #7d8ff5 !important;
}
a.bridge-left-active .bridge-icon {
color: #CCD1E1 !important;
}
a.bridge-left-active:hover {
color: #7989f0 !important;
color: #5971f7 !important;
}
a.bridge-left-active:hover .bridge-icon {
color: #fff !important;
Expand Down

0 comments on commit efffb34

Please sign in to comment.