# HG changeset patch # User nanaya # Date 1582464350 -32400 # Node ID 68231013b01b00be9bfb7043fd3c9844394e98bd # Parent 802dcd44188e7e1cf02799d9d5e809653a9e40f0 Now with more bootstrap than ever diff -r 802dcd44188e -r 68231013b01b Gemfile --- a/Gemfile Sun Feb 23 20:23:09 2020 +0900 +++ b/Gemfile Sun Feb 23 22:25:50 2020 +0900 @@ -2,6 +2,7 @@ gem "rails", "~> 6.0.0" gem "sass-rails" +gem "autoprefixer-rails" gem "webpacker" # Bundle edge Rails instead: diff -r 802dcd44188e -r 68231013b01b Gemfile.lock --- a/Gemfile.lock Sun Feb 23 20:23:09 2020 +0900 +++ b/Gemfile.lock Sun Feb 23 22:25:50 2020 +0900 @@ -61,10 +61,13 @@ minitest (~> 5.1) tzinfo (~> 1.1) zeitwerk (~> 2.2) + autoprefixer-rails (9.7.4) + execjs builder (3.2.4) concurrent-ruby (1.1.6) crass (1.0.6) erubi (1.9.0) + execjs (2.7.0) ffi (1.12.2) ffi (1.12.2-java) globalid (0.4.2) @@ -171,6 +174,7 @@ DEPENDENCIES activerecord-jdbcpostgresql-adapter + autoprefixer-rails jruby-openssl newrelic_rpm pg diff -r 802dcd44188e -r 68231013b01b app/assets/stylesheets/_bootstrap-zp.scss --- a/app/assets/stylesheets/_bootstrap-zp.scss Sun Feb 23 20:23:09 2020 +0900 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,58 +0,0 @@ -/*! - * Bootstrap v3.3.5 (http://getbootstrap.com) - * Copyright 2011-2015 Twitter, Inc. - * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) - * - * Modified for Zeropaste - */ - -// Core variables and mixins -@import "bootstrap-sass/assets/stylesheets/bootstrap/variables"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/mixins"; - -// Reset and dependencies -@import "bootstrap-sass/assets/stylesheets/bootstrap/normalize"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/print"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/glyphicons"; - -// Core CSS -@import "bootstrap-sass/assets/stylesheets/bootstrap/scaffolding"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/type"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/code"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/grid"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/tables"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/forms"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/buttons"; - -// Components -@import "bootstrap-sass/assets/stylesheets/bootstrap/component-animations"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/dropdowns"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/button-groups"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/input-groups"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/navs"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/navbar"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/breadcrumbs"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/pagination"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/pager"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/labels"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/badges"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/jumbotron"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/thumbnails"; -@import "bootstrap-sass/assets/stylesheets/bootstrap/alerts"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/progress-bars"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/media"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/list-group"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/panels"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-embed"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/wells"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/close"; - -// Components w/ JavaScript -@import "bootstrap-sass/assets/stylesheets/bootstrap/modals"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/tooltip"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/popovers"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/carousel"; - -// Utility classes -@import "bootstrap-sass/assets/stylesheets/bootstrap/utilities"; -// @import "bootstrap-sass/assets/stylesheets/bootstrap/responsive-utilities"; diff -r 802dcd44188e -r 68231013b01b app/assets/stylesheets/application.scss --- a/app/assets/stylesheets/application.scss Sun Feb 23 20:23:09 2020 +0900 +++ b/app/assets/stylesheets/application.scss Sun Feb 23 22:25:50 2020 +0900 @@ -1,53 +1,31 @@ -@import "bootstrap-zp"; +@import "bootstrap/scss/bootstrap"; @import "highlight.js/scss/default"; .input-url1 { display: none !important; } -// overrides bootstrap -.form-control { - font-size: 16px; -} - -.form-group--narrow { - max-width: 300px; -} - .paste-paste { resize: vertical; font-family: $font-family-monospace; } +.paste-content { + border: none; + background-color: #fff; + padding: 0px; + margin: 0px; +} + .paste-show { padding: $grid-gutter-width/2; margin-bottom: $grid-gutter-width/2; border-width: 0px 1px 1px 1px; border-style: solid; - border-color: $nav-tabs-active-link-hover-border-color; - border-radius: 0px 0px $border-radius-base $border-radius-base; - - &__content { - border: none; - background-color: #fff; - padding: 0px; - margin: 0px; - } - - &__footer { - padding-bottom: $grid-gutter-width/2; - } -} - -.radio-container { - margin-top: -10px; + border-color: $nav-tabs-border-color; + border-radius: 0px 0px $border-radius $border-radius; } .zp-hl { background-color: #fff; padding: 0px; } - -.zp-header { - margin-top: 0px; -} - diff -r 802dcd44188e -r 68231013b01b app/helpers/application_helper.rb --- a/app/helpers/application_helper.rb Sun Feb 23 20:23:09 2020 +0900 +++ b/app/helpers/application_helper.rb Sun Feb 23 22:25:50 2020 +0900 @@ -9,7 +9,7 @@ end def error_class(object, attribute) - "has-error" if object.errors.include? attribute + "is-invalid" if object.errors.include? attribute end def with_host(url) diff -r 802dcd44188e -r 68231013b01b app/javascript/src/main.coffee --- a/app/javascript/src/main.coffee Sun Feb 23 20:23:09 2020 +0900 +++ b/app/javascript/src/main.coffee Sun Feb 23 22:25:50 2020 +0900 @@ -1,7 +1,4 @@ -import 'bootstrap/js/transition' -import 'bootstrap/js/collapse' -import 'bootstrap/js/modal' -import 'bootstrap/js/tab' +import 'bootstrap' import hljs from 'highlight.js' import * as commonmark from 'commonmark' diff -r 802dcd44188e -r 68231013b01b app/views/layouts/_alerts.html.erb --- a/app/views/layouts/_alerts.html.erb Sun Feb 23 20:23:09 2020 +0900 +++ b/app/views/layouts/_alerts.html.erb Sun Feb 23 22:25:50 2020 +0900 @@ -1,12 +1,12 @@ <% if notice %> -
+ <% end %> <% if alert %> -
+ diff -r 802dcd44188e -r 68231013b01b app/views/layouts/application.html.erb --- a/app/views/layouts/application.html.erb Sun Feb 23 20:23:09 2020 +0900 +++ b/app/views/layouts/application.html.erb Sun Feb 23 22:25:50 2020 +0900 @@ -7,32 +7,41 @@ <%= stylesheet_link_tag "application", :media => "all" %> -