mirror of
https://github.com/internetee/registry.git
synced 2025-05-17 17:59:47 +02:00
Refactored stylesheets and fixed font
This commit is contained in:
parent
adf321bafa
commit
11399958f5
17 changed files with 130 additions and 135 deletions
9
app/assets/stylesheets/admin-manifest.sass
Normal file
9
app/assets/stylesheets/admin-manifest.sass
Normal file
|
@ -0,0 +1,9 @@
|
||||||
|
//= require 'shared/custom-boostrap'
|
||||||
|
@import shared/fonts
|
||||||
|
@import shared/general
|
||||||
|
@import nprogress
|
||||||
|
@import nprogress-bootstrap
|
||||||
|
@import typeaheadjs
|
||||||
|
@import selectize
|
||||||
|
@import selectize.bootstrap3
|
||||||
|
@import admin/admin
|
|
@ -1,7 +1,3 @@
|
||||||
body
|
|
||||||
padding-top: 40px
|
|
||||||
padding-bottom: 40px
|
|
||||||
|
|
||||||
.form-signin
|
.form-signin
|
||||||
max-width: 330px
|
max-width: 330px
|
||||||
padding: 15px
|
padding: 15px
|
|
@ -1,9 +0,0 @@
|
||||||
//= require 'custom-boostrap'
|
|
||||||
@import "nprogress";
|
|
||||||
@import "nprogress-bootstrap";
|
|
||||||
@import "bootstrap-ext";
|
|
||||||
@import "typeaheadjs";
|
|
||||||
@import "selectize";
|
|
||||||
@import "selectize.bootstrap3";
|
|
||||||
@import "general";
|
|
||||||
@import "app";
|
|
|
@ -1,13 +0,0 @@
|
||||||
$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif;
|
|
||||||
$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif;
|
|
||||||
$navbar-default-bg: #F69240;
|
|
||||||
$navbar-default-brand-color: #fff;
|
|
||||||
$navbar-default-link-color: #fff;
|
|
||||||
$border-radius-base: 2px;
|
|
||||||
$body-bg: #F8F8F8;
|
|
||||||
$container-large-desktop: 1040px;
|
|
||||||
$font-size-h1: 26px;
|
|
||||||
$navbar-default-link-active-color: #333;
|
|
||||||
|
|
||||||
@import "bootstrap-sprockets";
|
|
||||||
@import "bootstrap";
|
|
|
@ -1,65 +0,0 @@
|
||||||
@font-face {
|
|
||||||
font-family: 'EtelkaLightProRegular';
|
|
||||||
src: font_url('etelkalight-webfont.eot');
|
|
||||||
src: font_url('etelkalight-webfont.eot?#iefix') format('embedded-opentype'),
|
|
||||||
font_url('etelkalight-webfont.woff') format('woff'),
|
|
||||||
font_url('etelkalight-webfont.ttf') format('truetype'),
|
|
||||||
font_url('etelkalight-webfont.svg#EtelkaLightProRegular') format('svg');
|
|
||||||
font-weight: normal;
|
|
||||||
font-style: normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'EtelkaLightProBold';
|
|
||||||
src: font_url('etelkalightbold-webfont.eot');
|
|
||||||
src: font_url('etelkalightbold-webfont.eot?#iefix') format('embedded-opentype'),
|
|
||||||
font_url('etelkalightbold-webfont.woff') format('woff'),
|
|
||||||
font_url('etelkalightbold-webfont.ttf') format('truetype'),
|
|
||||||
font_url('etelkalightbold-webfont.svg#EtelkaLightProBold') format('svg');
|
|
||||||
font-weight: normal;
|
|
||||||
font-style: normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'EtelkaLightProItalic';
|
|
||||||
src: font_url('etelkalightitalic-webfont.eot');
|
|
||||||
src: font_url('etelkalightitalic-webfont.eot?#iefix') format('embedded-opentype'),
|
|
||||||
font_url('etelkalightitalic-webfont.woff') format('woff'),
|
|
||||||
font_url('etelkalightitalic-webfont.ttf') format('truetype'),
|
|
||||||
font_url('etelkalightitalic-webfont.svg#EtelkaLightProItalic') format('svg');
|
|
||||||
font-weight: normal;
|
|
||||||
font-style: normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'InfoTextBold';
|
|
||||||
src: font_url('infotexb-webfont.eot');
|
|
||||||
src: font_url('infotexb-webfont.eot?#iefix') format('embedded-opentype'),
|
|
||||||
font_url('infotexb-webfont.woff') format('woff'),
|
|
||||||
font_url('infotexb-webfont.ttf') format('truetype'),
|
|
||||||
font_url('infotexb-webfont.svg#InfoTextBold') format('svg');
|
|
||||||
font-weight: normal;
|
|
||||||
font-style: normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'InfoTextMedium';
|
|
||||||
src: font_url('infotexm-webfont.eot');
|
|
||||||
src: font_url('infotexm-webfont.eot?#iefix') format('embedded-opentype'),
|
|
||||||
font_url('infotexm-webfont.woff') format('woff'),
|
|
||||||
font_url('infotexm-webfont.ttf') format('truetype'),
|
|
||||||
font_url('infotexm-webfont.svg#InfoTextMedium') format('svg');
|
|
||||||
font-weight: normal;
|
|
||||||
font-style: normal;
|
|
||||||
}
|
|
||||||
|
|
||||||
@font-face {
|
|
||||||
font-family: 'InfoTextRegular';
|
|
||||||
src: font_url('infotexn-webfont.eot');
|
|
||||||
src: font_url('infotexn-webfont.eot?#iefix') format('embedded-opentype'),
|
|
||||||
font_url('infotexn-webfont.woff') format('woff'),
|
|
||||||
font_url('infotexn-webfont.ttf') format('truetype'),
|
|
||||||
font_url('infotexn-webfont.svg#InfoTextRegular') format('svg');
|
|
||||||
font-weight: normal;
|
|
||||||
font-style: normal;
|
|
||||||
}
|
|
|
@ -1,11 +0,0 @@
|
||||||
@import "fonts";
|
|
||||||
@import "registrar";
|
|
||||||
@import "bootstrap-sprockets";
|
|
||||||
@import "bootstrap";
|
|
||||||
@import "nprogress";
|
|
||||||
@import "nprogress-bootstrap";
|
|
||||||
@import "bootstrap-ext";
|
|
||||||
@import "typeaheadjs";
|
|
||||||
@import "selectize";
|
|
||||||
@import "selectize.bootstrap3";
|
|
||||||
@import "app";
|
|
8
app/assets/stylesheets/registrar-manifest.sass
Normal file
8
app/assets/stylesheets/registrar-manifest.sass
Normal file
|
@ -0,0 +1,8 @@
|
||||||
|
//= require 'shared/custom-boostrap'
|
||||||
|
@import shared/fonts
|
||||||
|
@import nprogress
|
||||||
|
@import nprogress-bootstrap
|
||||||
|
@import typeaheadjs
|
||||||
|
@import selectize
|
||||||
|
@import selectize.bootstrap3
|
||||||
|
@import registrar/registrar
|
|
@ -1,3 +1,17 @@
|
||||||
|
$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif
|
||||||
|
$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif
|
||||||
|
$navbar-default-bg: #F69240
|
||||||
|
$navbar-default-brand-color: #fff
|
||||||
|
$navbar-default-link-color: #fff
|
||||||
|
$border-radius-base: 2px
|
||||||
|
$body-bg: #F8F8F8
|
||||||
|
$container-large-desktop: 1040px
|
||||||
|
$font-size-h1: 26px
|
||||||
|
$navbar-default-link-active-color: #333
|
||||||
|
|
||||||
|
@import "bootstrap-sprockets"
|
||||||
|
@import "bootstrap"
|
||||||
|
|
||||||
.text-left-not-xs, .text-left-not-sm, .text-left-not-md, .text-left-not-lg
|
.text-left-not-xs, .text-left-not-sm, .text-left-not-md, .text-left-not-lg
|
||||||
text-align: left
|
text-align: left
|
||||||
|
|
||||||
|
@ -57,3 +71,4 @@
|
||||||
text-align: right
|
text-align: right
|
||||||
.text-justify-lg
|
.text-justify-lg
|
||||||
text-align: justify
|
text-align: justify
|
||||||
|
|
46
app/assets/stylesheets/shared/fonts.sass
Normal file
46
app/assets/stylesheets/shared/fonts.sass
Normal file
|
@ -0,0 +1,46 @@
|
||||||
|
@font-face
|
||||||
|
font-family: 'EtelkaLightProRegular'
|
||||||
|
src: font_url("etelkalight-webfont.eot")
|
||||||
|
src: font_url("etelkalight-webfont.eot?#iefix") format("embedded-opentype"), font_url("etelkalight-webfont.woff") format("woff"), font_url("etelkalight-webfont.ttf") format("truetype"), font_url("etelkalight-webfont.svg#EtelkaLightProRegular") format("svg")
|
||||||
|
font-weight: normal
|
||||||
|
font-style: normal
|
||||||
|
|
||||||
|
|
||||||
|
@font-face
|
||||||
|
font-family: 'EtelkaLightProBold'
|
||||||
|
src: font_url("etelkalightbold-webfont.eot")
|
||||||
|
src: font_url("etelkalightbold-webfont.eot?#iefix") format("embedded-opentype"), font_url("etelkalightbold-webfont.woff") format("woff"), font_url("etelkalightbold-webfont.ttf") format("truetype"), font_url("etelkalightbold-webfont.svg#EtelkaLightProBold") format("svg")
|
||||||
|
font-weight: normal
|
||||||
|
font-style: normal
|
||||||
|
|
||||||
|
|
||||||
|
@font-face
|
||||||
|
font-family: 'EtelkaLightProItalic'
|
||||||
|
src: font_url("etelkalightitalic-webfont.eot")
|
||||||
|
src: font_url("etelkalightitalic-webfont.eot?#iefix") format("embedded-opentype"), font_url("etelkalightitalic-webfont.woff") format("woff"), font_url("etelkalightitalic-webfont.ttf") format("truetype"), font_url("etelkalightitalic-webfont.svg#EtelkaLightProItalic") format("svg")
|
||||||
|
font-weight: normal
|
||||||
|
font-style: normal
|
||||||
|
|
||||||
|
|
||||||
|
@font-face
|
||||||
|
font-family: 'InfoTextBold'
|
||||||
|
src: font_url("infotexb-webfont.eot")
|
||||||
|
src: font_url("infotexb-webfont.eot?#iefix") format("embedded-opentype"), font_url("infotexb-webfont.woff") format("woff"), font_url("infotexb-webfont.ttf") format("truetype"), font_url("infotexb-webfont.svg#InfoTextBold") format("svg")
|
||||||
|
font-weight: normal
|
||||||
|
font-style: normal
|
||||||
|
|
||||||
|
|
||||||
|
@font-face
|
||||||
|
font-family: 'InfoTextMedium'
|
||||||
|
src: font_url("infotexm-webfont.eot")
|
||||||
|
src: font_url("infotexm-webfont.eot?#iefix") format("embedded-opentype"), font_url("infotexm-webfont.woff") format("woff"), font_url("infotexm-webfont.ttf") format("truetype"), font_url("infotexm-webfont.svg#InfoTextMedium") format("svg")
|
||||||
|
font-weight: normal
|
||||||
|
font-style: normal
|
||||||
|
|
||||||
|
|
||||||
|
@font-face
|
||||||
|
font-family: 'InfoTextRegular'
|
||||||
|
src: font_url("infotexn-webfont.eot")
|
||||||
|
src: font_url("infotexn-webfont.eot?#iefix") format("embedded-opentype"), font_url("infotexn-webfont.woff") format("woff"), font_url("infotexn-webfont.ttf") format("truetype"), font_url("infotexn-webfont.svg#InfoTextRegular") format("svg")
|
||||||
|
font-weight: normal
|
||||||
|
font-style: normal
|
|
@ -220,6 +220,47 @@ body.login
|
||||||
.form-control:focus
|
.form-control:focus
|
||||||
z-index: 2
|
z-index: 2
|
||||||
|
|
||||||
|
.error-tab > a
|
||||||
|
color: #a94442 !important
|
||||||
|
|
||||||
|
.edit-highlight
|
||||||
|
background-color: #E7E7E7
|
||||||
|
|
||||||
|
.navbar-brand
|
||||||
|
line-height: 12px
|
||||||
|
padding-top: 20px
|
||||||
|
padding-bottom: 5px
|
||||||
|
|
||||||
|
.navbar-brand small
|
||||||
|
display: block
|
||||||
|
font-size: 10px
|
||||||
|
|
||||||
|
.footer
|
||||||
|
color: #777
|
||||||
|
padding-top: 15px
|
||||||
|
font-size: 10px
|
||||||
|
|
||||||
|
.nowrap
|
||||||
|
white-space: nowrap
|
||||||
|
|
||||||
|
.form-signin
|
||||||
|
max-width: 330px
|
||||||
|
padding: 15px
|
||||||
|
margin: 0 auto
|
||||||
|
input
|
||||||
|
margin-bottom: 10px
|
||||||
|
|
||||||
|
.form-signin .form-control
|
||||||
|
position: relative
|
||||||
|
height: auto
|
||||||
|
-webkit-box-sizing: border-box
|
||||||
|
-moz-box-sizing: border-box
|
||||||
|
box-sizing: border-box
|
||||||
|
padding: 10px
|
||||||
|
font-size: 16px
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// fix label position for medium screen
|
// fix label position for medium screen
|
||||||
@media (min-width: 768px) and (max-width: 991px)
|
@media (min-width: 768px) and (max-width: 991px)
|
||||||
.form-horizontal .control-label
|
.form-horizontal .control-label
|
|
@ -1,5 +1,5 @@
|
||||||
class Admin::SessionsController < SessionsController
|
class Admin::SessionsController < SessionsController
|
||||||
layout 'login'
|
layout 'admin/application'
|
||||||
|
|
||||||
def create
|
def create
|
||||||
super
|
super
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
class AdminController < ApplicationController
|
class AdminController < ApplicationController
|
||||||
|
layout 'admin/application'
|
||||||
before_action :authenticate_user!
|
before_action :authenticate_user!
|
||||||
end
|
end
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
|
%h2.form-signin-heading.text-center Eesti Interneti SA
|
||||||
|
%hr
|
||||||
.form-signin
|
.form-signin
|
||||||
/ TODO: Refactor this when ID card login is done
|
/ TODO: Refactor this when ID card login is done
|
||||||
= button_to 'ID card (user1)', 'sessions',
|
= button_to 'ID card (user1)', admin_sessions_path,
|
||||||
class: 'btn btn-lg btn-primary btn-block', name: 'user1'
|
class: 'btn btn-lg btn-primary btn-block', name: 'user1'
|
||||||
= button_to 'ID card (user2)', 'sessions',
|
= button_to 'ID card (user2)', admin_sessions_path,
|
||||||
class: 'btn btn-lg btn-primary btn-block', name: 'user2'
|
class: 'btn btn-lg btn-primary btn-block', name: 'user2'
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
%meta{content: "Full stack top-level domain (TLD) management.", name: "description"}/
|
%meta{content: "Full stack top-level domain (TLD) management.", name: "description"}/
|
||||||
%meta{content: "Gitlab LTD", name: "author"}/
|
%meta{content: "Gitlab LTD", name: "author"}/
|
||||||
= csrf_meta_tags
|
= csrf_meta_tags
|
||||||
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
|
= stylesheet_link_tag 'admin-manifest', media: 'all', 'data-turbolinks-track' => true
|
||||||
= javascript_include_tag 'application', 'data-turbolinks-track' => true
|
= javascript_include_tag 'application', 'data-turbolinks-track' => true
|
||||||
= favicon_link_tag 'favicon.ico'
|
= favicon_link_tag 'favicon.ico'
|
||||||
%title Eesti Interneti SA
|
%title Eesti Interneti SA
|
||||||
|
@ -58,8 +58,9 @@
|
||||||
%li= link_to t(:repp_logs), admin_repp_logs_path
|
%li= link_to t(:repp_logs), admin_repp_logs_path
|
||||||
-# %li= link_to t(:background_jobs), admin_delayed_jobs_path
|
-# %li= link_to t(:background_jobs), admin_delayed_jobs_path
|
||||||
|
|
||||||
%ul.nav.navbar-nav.navbar-right
|
- if signed_in?
|
||||||
%li= link_to t('log_out', user: current_user), '/admin/logout'
|
%ul.nav.navbar-nav.navbar-right
|
||||||
|
%li= link_to t('log_out', user: current_user), '/admin/logout'
|
||||||
|
|
||||||
/ /.nav-collapse
|
/ /.nav-collapse
|
||||||
.container
|
.container
|
|
@ -1,27 +0,0 @@
|
||||||
!!!
|
|
||||||
%html{:lang => I18n.locale.to_s}
|
|
||||||
%head
|
|
||||||
%meta{:charset => "utf-8"}/
|
|
||||||
%meta{:content => "IE=edge", "http-equiv" => "X-UA-Compatible"}/
|
|
||||||
%meta{:content => "width=device-width, initial-scale=1", :name => "viewport"}/
|
|
||||||
%meta{:content => "Full stack top-level domain (TLD) management.", :name => "description"}/
|
|
||||||
%meta{:content => "Gitlab Ltd", :name => "author"}/
|
|
||||||
= csrf_meta_tags
|
|
||||||
= stylesheet_link_tag 'application', media: 'all', 'data-turbolinks-track' => true
|
|
||||||
= stylesheet_link_tag 'login', media: 'all', 'data-turbolinks-track' => true
|
|
||||||
= favicon_link_tag 'favicon.ico'
|
|
||||||
%title Eesti Interneti SA - Log In
|
|
||||||
%body{:style => env_style}
|
|
||||||
.container
|
|
||||||
.form-signin
|
|
||||||
- display = (flash.empty?) ? 'none' : 'block'
|
|
||||||
#flash{style: "display: #{display};"}
|
|
||||||
- type = (flash[:notice]) ? 'bg-success' : 'bg-danger'
|
|
||||||
.alert{class: type}= flash[:notice] || flash[:alert]
|
|
||||||
%h2.form-signin-heading.text-center Eesti Interneti SA
|
|
||||||
%hr
|
|
||||||
/ TODO: Refactor this when ID card login is done
|
|
||||||
= button_to 'ID card (user1)', admin_sessions_path,
|
|
||||||
class: 'btn btn-lg btn-primary btn-block', name: 'user1'
|
|
||||||
= button_to 'ID card (user2)', admin_sessions_path,
|
|
||||||
class: 'btn btn-lg btn-primary btn-block', name: 'user2'
|
|
|
@ -39,6 +39,7 @@ module Registry
|
||||||
|
|
||||||
# Precompile additional assets
|
# Precompile additional assets
|
||||||
config.assets.precompile += %w(*.svg *.eot *.woff *.ttf)
|
config.assets.precompile += %w(*.svg *.eot *.woff *.ttf)
|
||||||
|
config.assets.precompile += %w(admin-manifest.css)
|
||||||
|
|
||||||
# Active Record used to suppresses errors raised within
|
# Active Record used to suppresses errors raised within
|
||||||
# `after_rollback`/`after_commit` callbacks and only printed them to the logs.
|
# `after_rollback`/`after_commit` callbacks and only printed them to the logs.
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue