diff --git a/Gemfile b/Gemfile index 0b11eab88..9e58ced47 100644 --- a/Gemfile +++ b/Gemfile @@ -67,7 +67,8 @@ gem 'deep_cloneable', '~> 2.1.1' gem 'digidoc_client', '~> 0.2.1' # epp + repp client -gem 'depp', github: 'domify/depp' +# gem 'depp', github: 'domify/depp' +gem 'depp', path: '/home/martin/projects/depp' group :development do # dev tools diff --git a/Gemfile.lock b/Gemfile.lock index 86dcdf282..52bddf3ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,8 +9,18 @@ GIT request_store (~> 1.1.0) GIT - remote: git://github.com/domify/depp.git - revision: c4dfe022c5b74a681246ea6f9f183a35e09b7d5a + remote: git://github.com/haml/html2haml.git + revision: 6984f50bdbbd6291535027726a5697f28778ee8d + ref: 6984f50bdbbd6291535027726a5697f28778ee8d + specs: + html2haml (2.0.0.beta.2) + erubis (~> 2.7.0) + haml (~> 4.0.0) + nokogiri (~> 1.6.0) + ruby_parser (~> 3.5) + +PATH + remote: /home/martin/projects/depp specs: depp (0.0.1) coderay (>= 1.1.0) @@ -26,17 +36,6 @@ GIT uglifier (>= 2.6.1) uuidtools (>= 2.1.4) -GIT - remote: git://github.com/haml/html2haml.git - revision: 6984f50bdbbd6291535027726a5697f28778ee8d - ref: 6984f50bdbbd6291535027726a5697f28778ee8d - specs: - html2haml (2.0.0.beta.2) - erubis (~> 2.7.0) - haml (~> 4.0.0) - nokogiri (~> 1.6.0) - ruby_parser (~> 3.5) - GEM remote: https://rubygems.org/ specs: @@ -140,7 +139,7 @@ GEM coffee-script (2.3.0) coffee-script-source execjs - coffee-script-source (1.8.0) + coffee-script-source (1.9.1) countries (0.10.0) currencies (~> 0.4.2) crack (0.4.2) @@ -181,7 +180,7 @@ GEM builder (~> 3.2) equalizer (0.0.9) erubis (2.7.0) - execjs (2.2.2) + execjs (2.4.0) fabrication (2.12.2) faker (1.3.0) i18n (~> 0.5) @@ -404,7 +403,7 @@ GEM ruby2ruby (>= 2.1.1, < 3.0) virtus (~> 1.0) safe_yaml (1.0.4) - sass (3.4.10) + sass (3.4.13) sass-rails (5.0.1) railties (>= 4.0.0, < 5.0) sass (~> 3.1) diff --git a/app/assets/images/bg.jpg b/app/assets/images/bg.jpg new file mode 100644 index 000000000..74fd4a38c Binary files /dev/null and b/app/assets/images/bg.jpg differ diff --git a/app/assets/stylesheets/fonts.css.scss b/app/assets/stylesheets/fonts.css.scss new file mode 100644 index 000000000..fbbef2d22 --- /dev/null +++ b/app/assets/stylesheets/fonts.css.scss @@ -0,0 +1,65 @@ +@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; +} diff --git a/app/assets/stylesheets/registrar-manifest.css.scss b/app/assets/stylesheets/registrar-manifest.css.scss index 7f6b35b87..f6443df1e 100644 --- a/app/assets/stylesheets/registrar-manifest.css.scss +++ b/app/assets/stylesheets/registrar-manifest.css.scss @@ -1,3 +1,4 @@ +@import "fonts"; @import "registrar"; @import "bootstrap-sprockets"; @import "bootstrap"; diff --git a/app/assets/stylesheets/registrar.sass b/app/assets/stylesheets/registrar.sass index cd4ce3211..a7504f5f0 100644 --- a/app/assets/stylesheets/registrar.sass +++ b/app/assets/stylesheets/registrar.sass @@ -1,3 +1,198 @@ $navbar-default-bg: #F69240 $navbar-default-brand-color: #fff $navbar-default-link-color: #fff + +$font-family-sans-serif: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif +$font-family-serif: 'EtelkaLightProBold', Georgia, "Times New Roman", Times, serif + +html + font-size: 100% + overflow-y: scroll + -webkit-text-size-adjust: 100% + -ms-text-size-adjust: 100% + +body + background: url(image_path('bg.jpg')) + +h1 + font-size: 26px + margin-bottom: 16px + +a + color: #008fd7 + text-decoration: none + +a:hover, +a:active + color: #008fd7 + outline: 0 + +h1, h2, h3, h4, h1 a, h2 a, h3 a, h4 a + color: #272f34 + text-decoration: none + font-weight: normal + font-family: 'EtelkaLightProBold' + +h1 + font-size: 22px + text-transform: uppercase + +body, +button, +input, +select, +textarea + font-family: 'EtelkaLightProRegular', Arial, Helvetica, sans-serif + color: #5d6064 + font-size: 13px + +abbr[title] + border-bottom: 1px dotted + +b, +strong + font-weight: normal + font-family: 'EtelkaLightProBold' + +blockquote + margin: 1em 40px + +dfn + font-style: italic + +mark + background: #ff0 + color: #000 + +pre, +code, +kbd, +samp + font-family: monospace, serif + _font-family: 'courier new', monospace + font-size: 1em + +pre + white-space: pre + white-space: pre-wrap + word-wrap: break-word + +q + quotes: none + +q:before, +q:after + content: '' + content: none + +small + font-size: 75% + +sub, +sup + font-size: 75% + line-height: 0 + position: relative + vertical-align: baseline + +sup + top: -0.5em + +sub + bottom: -0.25em + +.title-row + margin-bottom: 22px + +.app-nav + padding-top: 7px + +.general-tab + padding-top: 30px + padding-right: 20px + border-top: 0px + +.container + border-radius: 3px + width: 860px +body > .container + background: #F8F8F8 + margin-bottom: 50px + min-height: 600px + padding: 30px 30px 56px 30px + +.container.version + background: transparent + margin-top: -116px + min-height: 0px + text-align: right + font-size: 12px + color: gray + +.container.subnav + background: transparent + min-height: 0 + padding: 0 46px 0 0 + margin-bottom: 0 + ul.nav + li a + background: #E7E7E7 + height: 33px + line-height: 12px + color: gray + &:hover + color: #333 + li.active a + background: #F8F8F8 + font-weight: bold + color: #333 + + +.subactions + h4 + margin-bottom: 20px + margin-top: 10px + min-height: 600px + +.sidebar + min-height: 400px + +.content + margin-right: 240px + margin-left: 0 + +h4 + margin: 0 + +.top-actions + margin-top: 12px + margin-bottom: 16px + float: right + +.navbar-brand + line-height: 12px + padding-top: 20px + padding-bottom: 5px + +.navbar-brand small + display: block + font-size: 10px + +.footer + color: #777 + padding-top: 70px + padding-bottom: 10px + font-size: 10px + +.field_with_errors + @extend .has-error + +.domify + td + vertical-align: middle !important + +// fix label position for medium screen +@media (min-width: 768px) and (max-width: 991px) + .form-horizontal .control-label + text-align: left + diff --git a/app/views/layouts/registrar.haml b/app/views/layouts/registrar.haml index 61e63eb0b..7220a8a58 100644 --- a/app/views/layouts/registrar.haml +++ b/app/views/layouts/registrar.haml @@ -10,7 +10,7 @@ = javascript_include_tag 'application', 'data-turbolinks-track' => true %link{href: "../../favicon.ico", rel: "icon"}/ %title EIS Registrar Portal - %body{:style => env_style} + %body / Static navbar .navbar.navbar-default.navbar-static-top{role: "navigation"} .container diff --git a/config/application.rb b/config/application.rb index 6a0ba117e..4d908932e 100644 --- a/config/application.rb +++ b/config/application.rb @@ -29,7 +29,7 @@ module Registry config.paths.add File.join('app', 'api'), glob: File.join('**', '*.rb') config.autoload_paths += Dir[Rails.root.join('app', 'api', '*')] - + # Load all model subdirs config.autoload_paths += Dir[Rails.root.join('app', 'models', '**/')] diff --git a/vendor/assets/fonts/etelkalight-webfont.eot b/vendor/assets/fonts/etelkalight-webfont.eot new file mode 100644 index 000000000..9f6dbca71 Binary files /dev/null and b/vendor/assets/fonts/etelkalight-webfont.eot differ diff --git a/vendor/assets/fonts/etelkalight-webfont.svg b/vendor/assets/fonts/etelkalight-webfont.svg new file mode 100644 index 000000000..867a8dfe6 --- /dev/null +++ b/vendor/assets/fonts/etelkalight-webfont.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vendor/assets/fonts/etelkalight-webfont.ttf b/vendor/assets/fonts/etelkalight-webfont.ttf new file mode 100644 index 000000000..a76260bda Binary files /dev/null and b/vendor/assets/fonts/etelkalight-webfont.ttf differ diff --git a/vendor/assets/fonts/etelkalight-webfont.woff b/vendor/assets/fonts/etelkalight-webfont.woff new file mode 100644 index 000000000..c9954602c Binary files /dev/null and b/vendor/assets/fonts/etelkalight-webfont.woff differ diff --git a/vendor/assets/fonts/etelkalightbold-webfont.eot b/vendor/assets/fonts/etelkalightbold-webfont.eot new file mode 100644 index 000000000..61376cc8f Binary files /dev/null and b/vendor/assets/fonts/etelkalightbold-webfont.eot differ diff --git a/vendor/assets/fonts/etelkalightbold-webfont.svg b/vendor/assets/fonts/etelkalightbold-webfont.svg new file mode 100644 index 000000000..5603bfc85 --- /dev/null +++ b/vendor/assets/fonts/etelkalightbold-webfont.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vendor/assets/fonts/etelkalightbold-webfont.ttf b/vendor/assets/fonts/etelkalightbold-webfont.ttf new file mode 100644 index 000000000..6294863aa Binary files /dev/null and b/vendor/assets/fonts/etelkalightbold-webfont.ttf differ diff --git a/vendor/assets/fonts/etelkalightbold-webfont.woff b/vendor/assets/fonts/etelkalightbold-webfont.woff new file mode 100644 index 000000000..ca86426b0 Binary files /dev/null and b/vendor/assets/fonts/etelkalightbold-webfont.woff differ diff --git a/vendor/assets/fonts/etelkalightitalic-webfont.eot b/vendor/assets/fonts/etelkalightitalic-webfont.eot new file mode 100644 index 000000000..b0e0cb4d5 Binary files /dev/null and b/vendor/assets/fonts/etelkalightitalic-webfont.eot differ diff --git a/vendor/assets/fonts/etelkalightitalic-webfont.svg b/vendor/assets/fonts/etelkalightitalic-webfont.svg new file mode 100644 index 000000000..e855a33c9 --- /dev/null +++ b/vendor/assets/fonts/etelkalightitalic-webfont.svg @@ -0,0 +1,241 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vendor/assets/fonts/etelkalightitalic-webfont.ttf b/vendor/assets/fonts/etelkalightitalic-webfont.ttf new file mode 100644 index 000000000..ae4118ecb Binary files /dev/null and b/vendor/assets/fonts/etelkalightitalic-webfont.ttf differ diff --git a/vendor/assets/fonts/etelkalightitalic-webfont.woff b/vendor/assets/fonts/etelkalightitalic-webfont.woff new file mode 100644 index 000000000..7e2373fae Binary files /dev/null and b/vendor/assets/fonts/etelkalightitalic-webfont.woff differ diff --git a/vendor/assets/fonts/infotexb-webfont.eot b/vendor/assets/fonts/infotexb-webfont.eot new file mode 100644 index 000000000..458863ed2 Binary files /dev/null and b/vendor/assets/fonts/infotexb-webfont.eot differ diff --git a/vendor/assets/fonts/infotexb-webfont.svg b/vendor/assets/fonts/infotexb-webfont.svg new file mode 100644 index 000000000..2f4392c4d --- /dev/null +++ b/vendor/assets/fonts/infotexb-webfont.svg @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vendor/assets/fonts/infotexb-webfont.ttf b/vendor/assets/fonts/infotexb-webfont.ttf new file mode 100644 index 000000000..5928c25f1 Binary files /dev/null and b/vendor/assets/fonts/infotexb-webfont.ttf differ diff --git a/vendor/assets/fonts/infotexb-webfont.woff b/vendor/assets/fonts/infotexb-webfont.woff new file mode 100644 index 000000000..e34878dd9 Binary files /dev/null and b/vendor/assets/fonts/infotexb-webfont.woff differ diff --git a/vendor/assets/fonts/infotexm-webfont.eot b/vendor/assets/fonts/infotexm-webfont.eot new file mode 100644 index 000000000..aa93018e9 Binary files /dev/null and b/vendor/assets/fonts/infotexm-webfont.eot differ diff --git a/vendor/assets/fonts/infotexm-webfont.svg b/vendor/assets/fonts/infotexm-webfont.svg new file mode 100644 index 000000000..7e98aa383 --- /dev/null +++ b/vendor/assets/fonts/infotexm-webfont.svg @@ -0,0 +1,238 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vendor/assets/fonts/infotexm-webfont.ttf b/vendor/assets/fonts/infotexm-webfont.ttf new file mode 100644 index 000000000..479cd6f97 Binary files /dev/null and b/vendor/assets/fonts/infotexm-webfont.ttf differ diff --git a/vendor/assets/fonts/infotexm-webfont.woff b/vendor/assets/fonts/infotexm-webfont.woff new file mode 100644 index 000000000..e8c7230a2 Binary files /dev/null and b/vendor/assets/fonts/infotexm-webfont.woff differ