modified: remarkbox_theme_meta/static/theme/meta/css/diff.css

modified:   remarkbox_theme_meta/templates/meta-base.j2
This commit is contained in:
russellballestrini 2017-11-21 11:29:43 -05:00
parent bf5636a87e
commit c56c459140
2 changed files with 14 additions and 8 deletions

View file

@ -137,13 +137,18 @@ ul {
float: left; float: left;
} }
.small-button { .small-button,
input.small-button {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;
padding-left: 15px; padding-left: 15px;
padding-right: 15px; padding-right: 15px;
} }
form.inline {
display: inline;
}
input.rb-submit.search { input.rb-submit.search {
height: 28px; height: 28px;
line-height: 28px; line-height: 28px;

View file

@ -23,6 +23,7 @@
<body class="remarkbox-body has-docked-nav"> <body class="remarkbox-body has-docked-nav">
{% set main_domain = "https://www.remarkbox.com" %} {% set main_domain = "https://www.remarkbox.com" %}
{% set main_join_domain = request.app.join_domain | default("https://my.remarkbox.com") %}
<noscript> <noscript>
<style> <style>
@ -39,13 +40,13 @@
<a class="navlink" href="https://meta.remarkbox.com">Meta</a> <a class="navlink" href="https://meta.remarkbox.com">Meta</a>
{%- if request.user %} {%- if request.user %}
{{ snippets.user_link(request.user, class='button') }} {{ snippets.user_link(request.user, class='button') }}
<a class="button red" href="/u/namespaces">setup</a> <a class="button red" href="{{ main_join_domain }}/u/namespaces">setup</a>
{%- else %} {%- else %}
<a class="navlink" href="{{ main_domain }}#about">About</a> <a class="navlink" href="{{ main_domain }}#about">About</a>
<a class="navlink" href="{{ main_domain }}#remarkbox-demo">Demo</a> <a class="navlink" href="{{ main_domain }}#remarkbox-demo">Demo</a>
<a class="navlink" href="{{ main_domain }}#plans">Plans</a> <a class="navlink" href="{{ main_domain }}#plans">Plans</a>
<a class="button" href="/join-or-log-in">Log in</a> <a class="button" href="{{ main_join_domain }}/join-or-log-in">Log in</a>
<a class="button red" href="/join-or-log-in">Join</a> <a class="button red" href="{{ main_join_domain }}/join-or-log-in">Join</a>
{%- endif %} {%- endif %}
</div> </div>
</div> </div>
@ -66,7 +67,7 @@
</span> </span>
{%- if request.user.authenticated %} {%- if request.user.authenticated %}
<a href="/u/namespaces" onclick="toggle('my-namespaces-div', 'my-namespaces-link', '&#9658 {{ request.namespace.name }}', '&#9662; &nbsp; {{ request.namespace.name }}'); return false;" id="my-namespaces-link"><span class="js-only">&#9658; </span>{{ request.namespace.name }}</a> <a href="{{ main_join_domain }}/u/namespaces" onclick="toggle('my-namespaces-div', 'my-namespaces-link', '&#9658 {{ request.namespace.name }}', '&#9662; &nbsp; {{ request.namespace.name }}'); return false;" id="my-namespaces-link"><span class="js-only">&#9658; </span>{{ request.namespace.name }}</a>
<div id="my-namespaces-div" class="my-namespaces-div"> <div id="my-namespaces-div" class="my-namespaces-div">
@ -75,14 +76,14 @@
{% for namespace in request.user.namespaces %} {% for namespace in request.user.namespaces %}
{% if namespace.name != request.domain %} {% if namespace.name != request.domain %}
<a href="/ns/{{ namespace.name }}">{{ namespace.name }}</a> <a href="{{ main_join_domain }}/ns/{{ namespace.name }}">{{ namespace.name }}</a>
<br/> <br/>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
<br/> <br/>
<center> <center>
<a href="/u/namespaces" class="button">setup</a> <a href="{{ main_join_domain }}/u/namespaces" class="button">setup</a>
</center> </center>
</div> </div>
&nbsp; &nbsp;
@ -95,7 +96,7 @@
{% else %} {% else %}
<a href="/join-or-log-in">join-or-log-in</a> <a href="{{ main_join_domain }}/join-or-log-in">join-or-log-in</a>
{%- endif %} {%- endif %}
{%- endblock %} {%- endblock %}