Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

load open sans from css, background image from css and create login css

Browse Source
This commit is contained in:
Julien Fastré 2018-07-19 10:42:36 +02:00
parent 0a0a7e7c24
commit 7bf090b753
9 changed files with 78 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Resources/public/css/scratch.css
View File

@ -4585,7 +4585,6 @@ header {
right: 0;
top: 0;
z-index: -1;
background-image: url("/bundles/chillmain/img/background/desert.jpg");
background-attachment: fixed;
background-repeat: no-repeat;
background-size: cover;

0
Resources/public/fonts/OpenSans/OpenSans.css → Resources/public/fonts/OpenSans/OpenSans.scss
View File

3
Resources/public/modules/login_page/index.js Normal file
View File

@ -0,0 +1,3 @@
require('./login.scss');

63
Resources/public/modules/login_page/login.scss Normal file
View File

@ -0,0 +1,63 @@
@import './../../fonts/OpenSans/OpenSans';
html, body {
height: 100%;
margin: 0;
padding: 0;
}
body {
background-color: #333;
color: white;
text-align: center;
font-family: 'Open Sans';
}
#content {
position: relative;
height: 90%;
padding-top: 10%;
}
#content:before {
bottom: 0;
content: "";
left: 0;
opacity: 0.2;
position: absolute;
right: 0;
top: 0;
z-index: -1;
background-image: url('./../../img/background/desert.jpg');
background-attachment: fixed;
background-repeat: no-repeat;
background-size: cover;
background-position: center;
}
label {
width : 15em;
text-align: right;
display: inline-block;
font-weight: 300;
padding-right: 5px;
}
input {
}
form {
}
button {
margin-left: 15em;
margin-top: 1em;
background-color: #df4949;
border: medium none;
border-radius: 0;
box-shadow: none;
color: #fff;
padding: 4px 8px;
font-family: 'Open Sans';
font-weight: 300;
}

3
Resources/public/sass/_custom.scss
View File

@ -1,6 +1,7 @@
// YOUR CUSTOM SCSS
@import 'custom/config/colors';
@import 'custom/config/variables';
@import 'custom/fonts';
@import 'custom/timeline';
@import 'custom/mixins/entity';
@import 'custom/activity';
@ -36,7 +37,7 @@ header {
right: 0;
top: 0;
z-index: -1;
background-image: url("/bundles/chillmain/img/background/desert.jpg");
background-image: url('./../../img/background/desert.jpg');
background-attachment: fixed;
background-repeat: no-repeat;
background-size: cover;

2
Resources/public/sass/custom/_fonts.scss Normal file
View File

@ -0,0 +1,2 @@
@import './../../fonts/OpenSans/OpenSans';

73
Resources/views/Login/login.html.twig
View File

@ -23,79 +23,12 @@
<title>
{{ 'Login to %installation_name%' | trans({ '%installation_name%' : installation.name } ) }}
</title>
<link rel="shortcut icon" href="/bundles/chillmain/img/favicon.ico" type="image/x-icon">
{% stylesheets output="css/login.css" filter="cssrewrite"
"bundles/chillmain/fonts/OpenSans/OpenSans.css" %}
<link rel="stylesheet" href="{{ asset_url }}"/>
{% endstylesheets %}
<style>
html, body {
height: 100%;
margin: 0;
padding: 0;
}
body {
background-color: #333;
color: white;
text-align: center;
font-family: 'Open Sans';
}
#content {
position: relative;
height: 90%;
padding-top: 10%;
}
#content:before {
bottom: 0;
content: "";
left: 0;
opacity: 0.2;
position: absolute;
right: 0;
top: 0;
z-index: -1;
background-image: url("/bundles/chillmain/img/background/desert.jpg");
background-attachment: fixed;
background-repeat: no-repeat;
background-size: cover;
background-position: center;
}
label {
width : 15em;
text-align: right;
display: inline-block;
font-weight: 300;
padding-right: 5px;
}
input {
}
form {
}
button {
margin-left: 15em;
margin-top: 1em;
background-color: #df4949;
border: medium none;
border-radius: 0;
box-shadow: none;
color: #fff;
padding: 4px 8px;
font-family: 'Open Sans';
font-weight: 300;
}
</style>
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
<link rel="stylesheet" href="{{ asset('build/login.css') }}"/>
</head>
<body>
<div id="content">
<img class="logo" src="/bundles/chillmain/img/logo-chill-outil-accompagnement_white.png">
<img class="logo" src="{{ asset('build/images/logo-chill-outil-accompagnement_white.png') }}">
{% if error is not null %}
<p>{{ error.message|trans }}</p>

23
Resources/views/layout.html.twig
View File

@ -27,16 +27,7 @@
<meta http-equiv="x-ua-compatible" content="ie=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>{{ installation.name }} - {% block title %}{% endblock %}</title>
<link rel="shortcut icon" href="/bundles/chillmain/img/favicon.ico" type="image/x-icon">
<!-- {% stylesheets output="css/all.css" filter="cssrewrite"
"bundles/chillmain/css/scratch.css"
"bundles/chillmain/css/chillmain.css"
"bundles/chillmain/css/select2/select2.css"
"bundles/chillmain/fonts/OpenSans/OpenSans.css"
"bundles/chillmain/css/pikaday.css" %}
<link rel="stylesheet" href="{{ asset_url }}"/>
{% endstylesheets %} -->
<link rel="shortcut icon" href="{{ asset('build/images/favicon.ico') }}" type="image/x-icon">
<link rel="stylesheet" href="{{ asset('build/chill.css') }}"/>
{% block css%}<!-- nothing added to css -->{% endblock %}
</head>
@ -46,7 +37,7 @@
<div class="grid-4 hide-tablet hide-mobile parent">
<div class="grid-10 push-2 grid-tablet-12 grid-mobile-12 push-tablet-0 grid-mobile-0 logo-container">
<a href="{{ path('chill_main_homepage') }}">
<img class="logo" src="/bundles/chillmain/img/logo-chill-sans-slogan_white.png">
<img class="logo" src="{{ asset('build/images/logo-chill-sans-slogan_white.png') }}">
</a>
</div>
</div>
@ -154,16 +145,6 @@
<br/> <a href="https://{{ app.request.locale }}.wikibooks.org/wiki/Chill">{{ 'User manual'|trans }}</a></p>
</footer>
<!-- {% javascripts output="js/libs.js"
"bundles/chillmain/js/jquery.js"
"bundles/chillmain/js/moment.js"
"bundles/chillmain/js/pikaday/pikaday.js"
"bundles/chillmain/js/select2/select2.js"
"bundles/chillmain/js/pikaday/plugins/pikaday.jquery.js"
"bundles/chillmain/js/chill.js" %}
<script src="{{ asset_url }}" type="text/javascript"></script>
{% endjavascripts %} -->
<script type="text/javascript" src="{{ asset('build/chill.js') }}"></script>
<script type="text/javascript">

3
chill.webpack.config.js
View File

@ -30,3 +30,6 @@ require('select2/dist/css/select2.css');
require('./Resources/public/modules/postal-code/index.js');
// img
require('./Resources/public/img/favicon.ico');
require('./Resources/public/img/logo-chill-sans-slogan_white.png');
require('./Resources/public/img/logo-chill-outil-accompagnement_white.png');