Skip to content

Commit

Permalink
New header style.
Browse files Browse the repository at this point in the history
  • Loading branch information
NoUseFreak committed Apr 15, 2015
1 parent e01dc47 commit df8f1ed
Show file tree
Hide file tree
Showing 10 changed files with 92 additions and 66 deletions.
20 changes: 10 additions & 10 deletions app/SymfonyRequirements.php
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function getTestMessage()
}

/**
* Returns the help text for resolving the problem
* Returns the help text for resolving the problem.
*
* @return string The help text
*/
Expand Down Expand Up @@ -119,10 +119,10 @@ class PhpIniRequirement extends Requirement
*
* @param string $cfgName The configuration name used for ini_get()
* @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false,
or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
* or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
* @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
* This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
* Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
* @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived)
* @param string|null $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived)
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
Expand Down Expand Up @@ -221,10 +221,10 @@ public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText
*
* @param string $cfgName The configuration name used for ini_get()
* @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false,
or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
* or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
* @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
* This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
* Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
* @param string $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived)
* @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived)
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
Expand All @@ -239,10 +239,10 @@ public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence =
*
* @param string $cfgName The configuration name used for ini_get()
* @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false,
or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
* or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement
* @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false.
This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
* This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin.
* Example: You require a config to be true but PHP later removes this config and defaults it to true internally.
* @param string $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived)
* @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived)
* @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags)
Expand Down
2 changes: 2 additions & 0 deletions app/config/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ framework:
twig:
debug: "%kernel.debug%"
strict_variables: "%kernel.debug%"
globals:
clastic_site_name: %clastic_site_name%

# Assetic Configuration
assetic:
Expand Down
3 changes: 3 additions & 0 deletions app/config/parameters.yml.dist
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ parameters:
debug_toolbar: true
debug_redirects: false
use_assetic_controller: true

# Clastic settings
clastic_site_name: Clastic
88 changes: 43 additions & 45 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

@navbar-height: 44px;
@navbar-margin-bottom: 0;
@navbar-default-bg: #2c6aa0;
@navbar-default-bg: #1e3042;
@navbar-default-color: #fff;
@navbar-default-link-color: @navbar-default-color;
@navbar-default-link-hover-color: @navbar-default-color;
Expand Down
13 changes: 8 additions & 5 deletions src/Clastic/BackofficeBundle/Resources/public/styles/common.less
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ body {
}
}



@footer-height: 40px;
.sticky-wrapper {
min-height: 100%;
Expand All @@ -66,9 +64,14 @@ body {
height: @footer-height;
}
.footer {
border-top: 1px solid #fff;
background-color: #000000;
color: #ccc;
padding: 10px 0;
a {
color: #999;
text-decoration: none;
transition: all 0.5s;
&:hover {
color: #000;
}
}
}

Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
.navbar.navbar-default {
border: none;
border-bottom: 4px solid #3498db;
}

.navbar-nav > li > a {
padding: 15px;
> img {
Expand Down
18 changes: 16 additions & 2 deletions src/Clastic/BackofficeBundle/Resources/public/styles/list.less
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@


/**
* Node list
*/
.node-list {
background-color: #fff;
border: 1px solid #ccc;
}
}

.pagerfanta {
padding: 15px 15px 10px;
}

.btn-add {
background-color: #3498db;
border-radius: 15px 5px 5px 15px;
color: #fff;
font-size: 13px;
padding: 5px 8px;
&:hover {
color: #fff;
}
}
4 changes: 2 additions & 2 deletions src/Clastic/BackofficeBundle/Resources/views/base.html.twig
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
</button>
<a class="navbar-brand" href="{{ path('clastic_backoffice_dashboard') }}">
<img src="{{ asset('bundles/clasticbackoffice/logo.png') }}" alt=""/>
Clastic
{{ clastic_site_name }}
</a>
</div>
<div id="navbar" class="navbar-collapse collapse">
Expand Down Expand Up @@ -50,7 +50,7 @@
<div class="container">
<div class="row">
<div class="col-md-6"></div>
<div class="col-md-6"><span class="pull-right">&copy; Dries De Peuter</span></div>
<div class="col-md-6"><span class="pull-right"><a href="http://clastic.nousefreak.be/">Powered by Clastic</a></span></div>
</div>
</div>
</footer>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
{% block html_title %}Clastic - {{ module.name }}{% endblock %}
{% block page_title -%}
{{ module.name }}
<a href="{{ path('clastic_node_form', {type: type}) }}"><i class="fa fa-plus-circle text-success"></i></a>

<a class="btn-add" href="{{ path('clastic_node_form', {type: type}) }}"><i class="fa fa-plus"></i> Add</a>
{%- endblock %}

{% block header_actions %}
Expand Down

0 comments on commit df8f1ed

Please sign in to comment.