Skip to content

Commit

Permalink
Updated the entires show view to include the accodian view, icon butt…
Browse files Browse the repository at this point in the history
…on, minimal styles. Plus a little work on importer show view to include the tabbed view for the collection versus work and the inclusion of one accordian, still need to add the accodian view to errors (#228)

Co-authored-by: April Rieger <[email protected]>
Co-authored-by: Benjamin Kiah Stroud <[email protected]>
  • Loading branch information
3 people authored Aug 11, 2020
1 parent 7791267 commit 7e41361
Show file tree
Hide file tree
Showing 15 changed files with 685 additions and 281 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ spec/test_app/log/*.log
spec/test_app/tmp/
coverage/**
.byebug_history
.DS_Store
tmp/**
.env.*
2 changes: 2 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ PATH
specs:
bulkrax (0.1.0)
bagit (~> 0.4)
coderay
iso8601 (~> 0.9.0)
language_list (~> 1.2, >= 1.2.1)
libxml-ruby (~> 3.1.0)
Expand Down Expand Up @@ -164,6 +165,7 @@ GEM
activesupport (>= 4.0.0)
mime-types (>= 1.16)
clipboard-rails (1.7.1)
coderay (1.1.3)
concurrent-ruby (1.1.6)
connection_pool (2.2.2)
crass (1.0.6)
Expand Down
2 changes: 2 additions & 0 deletions app/assets/javascripts/bulkrax/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,6 @@
// about supported directives.
//

//= require jquery
//= require bootstrap-sprockets
//= require_tree .
40 changes: 40 additions & 0 deletions app/assets/stylesheets/bulkrax/accordion.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
.accordion-icon {
float: right;
margin: 0 auto;
font-size: 22px;
transform: rotate(45deg);
margin-top: -2px;
}

.accordion-container {
width: 100%;
padding: 0px;
margin: 10px 0px;
border-radius: 4px;
border: 1px solid #dedede;
}

.accordion-heading {
padding: 14px 15px;
background-color: #f5f5f5;
border-radius: 3px;
}

.accordion-title {
font-size: 14px;
font-weight: bold;
color: #4E4A42;
&:hover {
color: #4E4A42;
}
}

.accordion-collapse {
width: 100%;
padding: 0px;
}

.accordion-body {
padding: 14px;
width: 100%;
}
20 changes: 1 addition & 19 deletions app/assets/stylesheets/bulkrax/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,4 @@
*
*= require_tree .
*= require_self
*/

div.importer_parser_fields_file_style span.radio {
display: inline;
margin-right: 20px;
}

div#file_upload, div#file_path {
display: none
}

div.hide-required-tag .required-tag {
display: none;
}

div#s2id_exporter_export_source_collection {
border: none;
padding: 0;
}
*/
264 changes: 264 additions & 0 deletions app/assets/stylesheets/bulkrax/coderay.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,264 @@
#bulkrax-raw-toggle-1, #bulkrax-raw-toggle-2 {
font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
font-size: 13px;
}

.CodeRay {
background-color: #FFF;
border: 1px solid #CCC;
font-family: Monaco, "Courier New", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", monospace;
color: #000;
}

.CodeRay pre {
margin: auto 0px;
width: 100%;
}

span.CodeRay {
white-space: pre;
border: 0px;
padding: 2px
}

table.CodeRay {
border-collapse: collapse;
width: 100%;
padding: 2px;
}

table.CodeRay td {
padding: 1em 0.5em;
vertical-align: top;
}

.CodeRay .line-numbers, .CodeRay .no {
background-color: #ECECEC;
color: #AAA;
text-align: right;
}

.CodeRay .line-numbers a {
color: #AAA;
}

.CodeRay .line-numbers tt { font-weight: bold; }
.CodeRay .line-numbers .highlighted { color: red; }

.CodeRay .line {
display: block;
float: left;
width: 100%;
}

.CodeRay span.line-numbers { padding: 0px 4px; }
.CodeRay .code { width: 100%; }

ol.CodeRay { font-size: 10pt; }
ol.CodeRay li { white-space: pre; }

.CodeRay .code pre { overflow: auto; }

.CodeRay .annotation { color: #007; }
.CodeRay .attribute-name { color: #f08; }
.CodeRay .attribute-value { color: #700; }

.CodeRay .binary {
color: #509;
font-weight: bold;
}

.CodeRay .comment {
color: #998;
font-style: italic;
}

.CodeRay .char { color: #04D; }
.CodeRay .char .content { color: #04D; }
.CodeRay .char .delimiter { color: #039; }

.CodeRay .class {
color: #458;
font-weight: bold;
}

.CodeRay .complex {
color: #A08;
font-weight: bold;
}

.CodeRay .constant { color: teal; }
.CodeRay .color { color: #0A0; }
.CodeRay .class-variable { color: #369; }
.CodeRay .decorator { color: #B0B; }

.CodeRay .definition {
color: #099;
font-weight: bold;
}

.CodeRay .directive {
color: #088;
font-weight: bold;
}

.CodeRay .delimiter { color: black; }
.CodeRay .doc { color: #970; }
.CodeRay .doctype { color: #34b; }

.CodeRay .doc-string {
color: #D42;
font-weight: bold;
}

.CodeRay .escape {
color: #666;
font-weight: bold;
}

.CodeRay .entity {
color: #800;
font-weight: bold;
}

.CodeRay .error {
color: #F00;
background-color: #FAA;
}

.CodeRay .exception {
color: #C00;
font-weight: bold;
}

.CodeRay .filename { color: #099; }

.CodeRay .function {
color: #900;
font-weight: bold;
}

.CodeRay .global-variable {
color: teal;
font-weight: bold;
}

.CodeRay .hex {
color: #058;
font-weight: bold;
}

.CodeRay .integer { color: #099; }

.CodeRay .include {
color: #B44;
font-weight: bold;
}

.CodeRay .inline { color: #000; }
.CodeRay .inline .inline { background: #ccc; }
.CodeRay .inline .inline .inline { background: #bbb; }
.CodeRay .inline .inline-delimiter { color: #D14; }
.CodeRay .inline-delimiter { color: #D14; }
.CodeRay .important { color: #f00; }

.CodeRay .interpreted {
color: #B2B;
font-weight: bold;
}

.CodeRay .instance-variable { color: teal; }

.CodeRay .label {
color: #970;
font-weight: bold;
}

.CodeRay .local-variable { color: #963; }

.CodeRay .octal {
color: #40E;
font-weight: bold;
}

.CodeRay .predefined-constant { font-weight: bold; }

.CodeRay .predefined {
color: #369;
font-weight: bold;
}
.CodeRay .preprocessor { color: #579; }

.CodeRay .pseudo-class {
color: #00C;
font-weight: bold;
}
.CodeRay .predefined-type { color: #074; font-weight: bold; }
.CodeRay .reserved, .keyword { color: #000; font-weight: bold; }

.CodeRay .key { color: #808; }
.CodeRay .key .delimiter { color: #606; }
.CodeRay .key .char { color: #80f; }
.CodeRay .value { color: #088; }

.CodeRay .regexp { background-color: #fff0ff; }
.CodeRay .regexp .content { color: #808; }
.CodeRay .regexp .delimiter { color: #404; }
.CodeRay .regexp .modifier { color: #C2C; }

.CodeRay .regexp .function {
color: #404;
font-weight: bold;
}

.CodeRay .string { color: #D20; }
.CodeRay .string .string .string { background-color: #ffd0d0; }
.CodeRay .string .content { color: #D14; }
.CodeRay .string .char { color: #D14; }
.CodeRay .string .delimiter { color: #D14; }

.CodeRay .shell { color: #D14; }
.CodeRay .shell .delimiter { color: #D14; }

.CodeRay .symbol { color: #990073; }
.CodeRay .symbol .content { color: #A60; }
.CodeRay .symbol .delimiter { color: #630; }

.CodeRay .tag { color: #070; }

.CodeRay .tag-special {
color: #D70;
font-weight: bold;
}

.CodeRay .type {
color: #339;
font-weight: bold;
}

.CodeRay .variable { color: #036; }
.CodeRay .insert { background: #afa; }
.CodeRay .delete { background: #faa; }

.CodeRay .change {
color: #aaf;
background: #007;
}

.CodeRay .head {
color: #f8f;
background: #505;
}

.CodeRay .insert .insert {
color: #080;
font-weight: bold;
}

.CodeRay .delete .delete {
color: #800;
font-weight: bold;
}

.CodeRay .change .change { color: #66f; }
.CodeRay .head .head { color: #f4f; }
Loading

0 comments on commit 7e41361

Please sign in to comment.