Skip to content

Commit

Permalink
Use pure-g-full
Browse files Browse the repository at this point in the history
  • Loading branch information
@kcaran
kcaran committed Aug 31, 2020
1 parent 055cd52 commit 9107fd1
Show file tree
Hide file tree
Showing 21 changed files with 136 additions and 130 deletions.
6 changes: 3 additions & 3 deletions addlink.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</head>
<body>
{include="page.header"}
<div class="pure-g">
<div class="pure-u-1-24"></div>
<div id="addlink-form" class="page-form page-form-light pure-u-22-24">
<div class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<div id="addlink-form" class="page-form page-form-light pure-u-20-24">
<h2 class="window-title">{"Shaare a new link"|t}</h2>
<form method="GET" action="{$base_path}/admin/shaare" name="addform" class="addform">
<div>
Expand Down
6 changes: 3 additions & 3 deletions changepassword.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</head>
<body>
{include="page.header"}
<div class="pure-g">
<div class="pure-u-lg-1-3 pure-u-1-24"></div>
<div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24">
<div class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<div id="addlink-form" class="page-form page-form-light pure-u-20-24">
<h2 class="window-title">{"Change password"|t}</h2>
<form method="POST" action="{$base_path}/admin/password" name="changepasswordform" id="changepasswordform">
<div>
Expand Down
6 changes: 3 additions & 3 deletions changetag.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</head>
<body>
{include="page.header"}
<div class="pure-g">
<div class="pure-u-lg-1-3 pure-u-1-24"></div>
<div id="addlink-form" class="page-form page-form-light pure-u-lg-1-3 pure-u-22-24">
<div class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<div id="addlink-form" class="page-form page-form-light pure-u-20-24">
<h2 class="window-title">{"Manage tags"|t}</h2>
<form method="POST" action="{$base_path}/admin/tags" name="changetag" id="changetag">
<div>
Expand Down
6 changes: 3 additions & 3 deletions configure.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
{$ratioInputMobile='1-8'}

<form method="POST" action="{$base_path}/admin/configure" name="configform" id="configform">
<div class="pure-g">
<div class="pure-u-1-24"></div>
<div class="pure-u-22-24 page-form page-form-complete">
<div class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<div class="pure-u-20-24 page-form page-form-complete">
<h2 class="window-title">{'Configure'|t}</h2>

<p>
Expand Down
84 changes: 47 additions & 37 deletions css/shaarli.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3920,14 +3920,24 @@ body {
.pure-g [class*=pure-u] {
font-family: Roboto, arial, sans-serif; }

/* Set up pure grids to have 20px gutters @ 1140px (use 12 not 24) */
.pure-g-full {
width: 1140px;
margin-left: auto;
margin-right: auto; }

.pure-g-full > * {
padding: 0 10px; }

.strong {
font-weight: bold; }

.clear {
clear: both; }

.center {
margin: auto;
margin-left: auto;
margin-right: auto;
text-align: center; }

.label {
Expand Down Expand Up @@ -4005,8 +4015,8 @@ pre {
margin-bottom: 20px; }

.shaarli-menu {
margin: auto;
width: 1140px; }
margin-left: auto;
margin-right: auto; }
.shaarli-menu > div {
margin-bottom: 8px; }

Expand Down Expand Up @@ -4189,8 +4199,7 @@ pre {
.container {
position: relative;
z-index: 2;
margin: auto;
width: 1140px; }
margin: auto; }

.toolbar-plugin {
margin: 5px 0;
Expand Down Expand Up @@ -4224,7 +4233,7 @@ pre {
display: inline-block;
position: absolute;
top: -4px;
right: 0; }
right: 10px; }
.linklist-filters a {
display: inline-block;
margin: 3px 0;
Expand Down Expand Up @@ -4434,7 +4443,7 @@ pre {
.linklist-item-infos {
position: absolute;
top: -4px;
right: 0px; }
right: -8px; }
.linklist-item-infos a {
text-decoration: none;
color: #252525; }
Expand Down Expand Up @@ -4516,7 +4525,7 @@ pre {
.footer-container a {
color: #252525; }

.page-form input[type="text"], .page-form input[type="password"], .page-form textarea {
.pure-g .page-form input[type="text"], .pure-g .page-form input[type="password"], .pure-g .page-form textarea {
margin: 10px 0;
border: solid 1px #d8d8d8;
border-radius: 2px;
Expand All @@ -4525,7 +4534,7 @@ pre {
height: 35px;
color: #252525; }

.page-form a.button, .page-form input[type="submit"] {
.pure-g .page-form a.button, .pure-g .page-form input[type="submit"] {
display: inline-block;
margin: 15px 5px;
border: 0;
Expand All @@ -4540,81 +4549,82 @@ pre {
font-size: 1.2em;
font-weight: normal; }

.page-form {
.pure-g .page-form {
margin: 20px 0 0;
padding: 4px 80px;
box-shadow: 1px 1px 2px #797979;
background: #f5f5f5;
overflow: hidden;
color: #252525; }
.page-form label {
.pure-g .page-form label {
margin-top: 16px;
display: inline-block;
font-weight: 500; }
.page-form .window-title {
.pure-g .page-form .window-title {
margin: 16px 0px;
background: #f5f5f5;
width: 100%;
text-align: left;
color: var(--main-color); }
.page-form .window-subtitle {
.pure-g .page-form .window-subtitle {
text-align: left; }
.page-form a {
.pure-g .page-form a {
text-decoration: none;
color: var(--main-color);
font-weight: bold; }
.page-form a:hover {
.pure-g .page-form a:hover {
color: #186446; }
.page-form p {
.pure-g .page-form p {
margin: 0; }
.page-form input[type="text"]::-webkit-input-placeholder {
.pure-g .page-form input[type="text"]::-webkit-input-placeholder {
color: #797979; }
.page-form input[type="password"]::-webkit-input-placeholder {
.pure-g .page-form input[type="password"]::-webkit-input-placeholder {
color: #797979; }
.page-form input[type="submit"]:hover {
.pure-g .page-form input[type="submit"]:hover {
background-color: #186446; }
.page-form textarea {
.pure-g .page-form textarea {
padding: 15px 5px 3px 15px;
min-height: 240px;
resize: vertical;
overflow-y: auto;
word-wrap: break-word; }
.page-form select {
.pure-g .page-form select {
color: #252525;
padding: 4px 16px 4px 8px; }
.page-form label span + select {
.pure-g .page-form label span + select {
display: block;
margin-top: 8px; }
.page-form .button.button-red {
.pure-g .page-form .button.button-red {
background: #ac2925;
color: #fff; }
.page-form .button:hover {
.pure-g .page-form .button:hover {
color: #fff;
opacity: 0.8; }
.page-form .submit-buttons {
.pure-g .page-form .submit-buttons {
margin-bottom: 10px; }
.page-form section {
.pure-g .page-form section {
margin: 10px 0 25px; }
.page-form table,
.page-form th,
.page-form td {
.pure-g .page-form table,
.pure-g .page-form th,
.pure-g .page-form td {
border-width: 1px 0;
border-style: solid;
border-color: #797979; }
.page-form th,
.page-form td {
border-color: #797979;
border-collapse: collapse; }
.pure-g .page-form th,
.pure-g .page-form td {
padding: 5px; }
.page-form table {
.pure-g .page-form table {
margin: auto;
width: 90%; }
.page-form table .order {
.pure-g .page-form table .order {
text-decoration: none;
color: #252525; }
.page-form .awesomplete {
.pure-g .page-form .awesomplete {
width: 100%; }
.page-form .awesomplete input {
.pure-g .page-form .awesomplete input {
width: 100%; }
.page-form div .awesomplete > ul {
.pure-g .page-form div .awesomplete > ul {
color: #000; }

@media screen and (min-width: 64em) {
Expand Down
6 changes: 3 additions & 3 deletions daily.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<body>
{include="page.header"}

<div class="pure-g">
<div class="pure-u-lg-1-6 pure-u-1-24"></div>
<div class="pure-u-lg-2-3 pure-u-22-24 page-form page-visitor" id="daily">
<div class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<div class="pure-u-20-24 page-form page-visitor" id="daily">
<h2 class="window-title">
{'The Daily Shaarli'|t}
<a href="{$base_path}/daily-rss" title="{'1 RSS entry per day'|t}"><i class="fa fa-rss"></i></a>
Expand Down
6 changes: 3 additions & 3 deletions editlink.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
</head>
<body>
{include="page.header"}
<div id="editlinkform" class="edit-link-container" class="pure-g">
<div class="pure-u-lg-1-5 pure-u-1-24"></div>
<div id="editlinkform" class="edit-link-container" class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<form method="post"
name="linkform"
action="{$base_path}/admin/shaare"
class="page-form pure-u-22-24 page-form page-form-light"
class="page-form pure-u-20-24 page-form page-form-light"
>
<h2 class="window-title">
{if="!$link_is_new"}{'Edit Shaare'|t}{else}{'New Shaare'|t}{/if}
Expand Down
6 changes: 3 additions & 3 deletions export.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
{include="page.header"}

<form method="POST" action="{$base_path}/admin/export" name="exportform" id="exportform">
<div class="pure-g">
<div class="pure-u-lg-1-4 pure-u-1-24"></div>
<div class="pure-u-lg-1-2 pure-u-22-24 page-form page-form-complete">
<div class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<div class="pure-u-20-24 page-form page-form-complete">
<div>
<h2 class="window-title">{"Export Database"|t}</h2>
</div>
Expand Down
6 changes: 3 additions & 3 deletions import.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
{include="page.header"}

<form method="POST" action="{$base_path}/admin/import" enctype="multipart/form-data" name="uploadform" id="uploadform">
<div class="pure-g">
<div class="pure-u-lg-1-4 pure-u-1-24"></div>
<div class="pure-u-lg-1-2 pure-u-22-24 page-form page-form-complete">
<div class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<div class="pure-u-20-24 page-form page-form-complete">
<div>
<h2 class="window-title">{"Import Database"|t}</h2>
</div>
Expand Down
6 changes: 3 additions & 3 deletions install.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
{$ratioInputMobile='1-8'}

<form method="POST" action="{$base_path}/install" name="installform" id="installform">
<div class="pure-g">
<div class="pure-u-lg-1-6 pure-u-1-24"></div>
<div class="pure-u-lg-2-3 pure-u-22-24 page-form page-form-complete">
<div class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<div class="pure-u-20-24 page-form page-form-complete">
<h2 class="window-title">{'Install Shaarli'|t}</h2>

<div class="center">
Expand Down
10 changes: 5 additions & 5 deletions linklist.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
{/loop}

<div id="linklist">
<div id="link-count-block" class="pure-g link-count-block">
<div id="link-count-block" class="pure-g pure-g-full link-count-block">
<div id="link-count-content" class="pure-u-1">
<div id="plugin_zone_start_linklist" class="plugin_zone">
{loop="$plugin_start_zone"}
Expand All @@ -35,13 +35,13 @@
</div>

{if="count($links)==0"}
<div id="search-result-block" class="pure-g pure-alert pure-alert-error search-result">
<div id="search-result-block" class="pure-g pure-g-full pure-alert pure-alert-error search-result">
<div id="search-result-content" class="pure-u-20-24">
<div id="searchcriteria">{'Nothing found.'|t}</div>
</div>
</div>
{elseif="!empty($search_term) or $search_tags !== '' or !empty($visibility) or $untaggedonly"}
<div id="search-result-block" class="pure-g pure-alert pure-alert-success search-result">
<div id="search-result-block" class="pure-g pure-g-full pure-alert pure-alert-success search-result">
<div id="search-result-content" class="pure-u-20-24 search-result-main">
{function="sprintf(t('%s result', '%s results', $result_count), $result_count)"}
{if="!empty($search_term)"}
Expand Down Expand Up @@ -75,7 +75,7 @@
</div>
{/if}

<div id="linklist-loop-block" class="pure-g">
<div id="linklist-loop-block" class="pure-g pure-g-full">
<div id="linklist-loop-content" class="pure-u-1">
{ignore}Set translation here, for performances{/ignore}
{$strPrivate=t('Private')}
Expand Down Expand Up @@ -229,7 +229,7 @@ <h2 class="pure-u-3-5">
{/loop}
</div>

<div id="linklist-paging-bottom-block" class="pure-g link-count-block">
<div id="linklist-paging-bottom-block" class="pure-g pure-g-full link-count-block">
<div id="linklist-paging-bottom-content" class="pure-u-1">
<div class="linklist-pages">
{if="$next_page_url"}
Expand Down
6 changes: 3 additions & 3 deletions loginform.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
</head>
<body>
{include="page.header"}
<div class="pure-g">
<div class="pure-u-1-24"></div>
<div id="login-form" class="page-form page-form-light pure-u-22-24 login-form-container">
<div class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<div id="login-form" class="page-form page-form-light pure-u-20-24 login-form-container">
<form method="post" name="loginform">
<h2 class="window-title">{'Login'|t}</h2>
<div>
Expand Down
2 changes: 1 addition & 1 deletion page.footer.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
</main>

<div class="pure-g">
<div class="pure-g pure-g-full">
<div class="pure-u-2-24"></div>
<footer id="footer" class="pure-u-20-24 footer-container" role="contentinfo">
<i class="fa fa-shaarli" aria-hidden="true"></i>
Expand Down
4 changes: 2 additions & 2 deletions page.header.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div id="shaarli-menu">
<div class="shaarli-menu pure-g">
<div class="shaarli-menu pure-g pure-g-full">
<div class="pure-u-lg-0 pure-u-1">
<div class="pure-menu">
<header role="banner">
Expand Down Expand Up @@ -123,7 +123,7 @@

<main id="content" class="container" role="main">
<div id="actions" class="subheader-form">
<div class="pure-g">
<div class="pure-g pure-g-full">
<div class="pure-u-1">
<a href="" id="actions-delete" class="button">
<i class="fa fa-trash" aria-hidden="true"></i>
Expand Down
Loading

0 comments on commit 9107fd1

Please sign in to comment.