FishEye: Tag 819e8122b947b824c934ca8cfe23a674ece09424 refers to a dead (removed) revision in file `arms/css/jspreadsheet/custom_icon.css'. FishEye: No comparison available. Pass `N' to diff? Index: arms/css/jspreadsheet/custom_sheet.css =================================================================== diff -u -r20ad6e44c4d98deb67a355defb7e89113ca3119c -r819e8122b947b824c934ca8cfe23a674ece09424 --- arms/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 20ad6e44c4d98deb67a355defb7e89113ca3119c) +++ arms/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 819e8122b947b824c934ca8cfe23a674ece09424) @@ -198,6 +198,14 @@ } /* custom_icon setting*/ +.fa:before { + width: 16px; + display: inline-block; + height: 16px; + text-align: center; + vertical-align: middle; +} + #modal_excel .fa:before { width: 16px; display: inline-block; Index: arms/js/analysisCost.js =================================================================== diff -u -r8e151e9337a3a6f4b82fb37b6d89b428007c59f9 -r819e8122b947b824c934ca8cfe23a674ece09424 --- arms/js/analysisCost.js (.../analysisCost.js) (revision 8e151e9337a3a6f4b82fb37b6d89b428007c59f9) +++ arms/js/analysisCost.js (.../analysisCost.js) (revision 819e8122b947b824c934ca8cfe23a674ece09424) @@ -46,7 +46,6 @@ "../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.datatables.css", "../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.theme.css", "./js/common/jspreadsheet/spreadsheet.js", - "./css/jspreadsheet/custom_icon.css", "./css/jspreadsheet/custom_sheet.css" ], [ Index: arms/js/common/jspreadsheet/spreadsheet.js =================================================================== diff -u -rcb6f17d2285a784bd1b44e477ea0eb54afdf6dfc -r819e8122b947b824c934ca8cfe23a674ece09424 --- arms/js/common/jspreadsheet/spreadsheet.js (.../spreadsheet.js) (revision cb6f17d2285a784bd1b44e477ea0eb54afdf6dfc) +++ arms/js/common/jspreadsheet/spreadsheet.js (.../spreadsheet.js) (revision 819e8122b947b824c934ca8cfe23a674ece09424) @@ -7,8 +7,7 @@ $.getStylesheet("../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jsuites.css"), $.getStylesheet("../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.css"), $.getStylesheet("../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.theme.css"), - $.getStylesheet("./css/jspreadsheet/custom_sheet.css"), - $.getStylesheet("./css/jspreadsheet/custom_icon.css") + $.getStylesheet("./css/jspreadsheet/custom_sheet.css") ).done(function() { $.fn.spreadsheet = function (option) { Index: controltower/css/jspreadsheet/custom_sheet.css =================================================================== diff -u -r6e27cdb23581553d4f475b80a4a5d5c31b1f2676 -r819e8122b947b824c934ca8cfe23a674ece09424 --- controltower/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 6e27cdb23581553d4f475b80a4a5d5c31b1f2676) +++ controltower/css/jspreadsheet/custom_sheet.css (.../custom_sheet.css) (revision 819e8122b947b824c934ca8cfe23a674ece09424) @@ -1,4 +1,5 @@ :root { + --jexcel_header_color: #000; --jexcel_header_color_highlighted: #000; --jexcel_header_background: #f3f3f3; @@ -17,57 +18,86 @@ --active_color: #007aff; /* - dark theme 설정 + dark theme 설정 + 313131 의 alpha 값 활용 */ --dark_toolbar_background: rgba(51,51,51,0.9); --dark_toolbar_color: #FFF; --dark_jexcel_header_background: rgba(51,51,51,0.95); - --dark_jexcel_border_color_5: rgba(51,51,51,0.5); /*--dark_jexcel_row_col_header_color: #646463;*/ - --dark_jexcel_row_col_header_color: #FFF; - --dark_border_color: #737271; + --dark_jexcel_row_col_header_color: #EEE; + --dark_jexcel_border_color_5: rgba(51,51,51,0.5); + --dark_border_color: rgba(51,51,51,1); } -.tb-default-color { - color: #000 !important; +.jexcel_container .jexcel_content { + box-shadow: none !important; } -.jexcel tbody tr td { - border-left: 1px solid #ccc !important; +.jexcel_content{ + padding-right: 0 !important; + font-size: 12px; + line-height: 20px !important; /* 행간 설정 */ } -.jexcel tbody tr:nth-child(even) td{ - /*background-color: #E6E6E6;*/ -} -.jexcel { - background: #DDD; +.jexcel_toolbar i.jexcel_toolbar_item { + line-height: 16px !important; } +.jexcel tbody tr td.readonly { + color: #a4c6ff; +} -.jexcel_pagination { - max-height: 40px; +/* + * DarkTheme 을 위한 설정 + */ +/* toolbar setting */ +.jexcel_container.dark-theme .jexcel_toolbar { + background: var(--dark_toolbar_background); + border-bottom: 1px solid var(--dark_toolbar_background); + border-top: 1px solid var(--dark_toolbar_background); } -.jexcel_toolbar { - margin: 0 !important; +.jexcel_container.dark-theme .tb-default-color, .jexcel_toolbar_item { + color: var(--dark_toolbar_color); } +.jexcel_container.dark-theme .jexcel { + border: none !important; +} -.jexcel_container .jexcel_content { - box-shadow: none !important; +/* header row, column */ +.jexcel_container.dark-theme .jexcel thead tr td, +.jexcel_container.dark-theme .jexcel_row{ + background-color: var(--dark_jexcel_header_background) !important; + color: var(--dark_jexcel_row_col_header_color) !important; + border-bottom: 1px solid #787878 !important; } +.jexcel_container.dark-theme .jexcel > thead { + background-color: transparent !important; +} +/* cell */ +.jexcel_container.dark-theme .jexcel tbody tr td { + border-top: none !important; + border-right: 1px solid var(--dark_border_color) !important; + border-bottom: 1px solid var(--dark_border_color) !important; + border-left: none !important;; + padding: 5px !important; +} -.jexcel_content{ - padding-right: 0px !important; +/* pagination */ +.jexcel_container.dark-theme .jexcel_pagination div div { + background-color: var(--dark_jexcel_header_background) !important; + color: var(--dark_jexcel_row_col_header_color) !important; } -.cell-header { - font-size: 13px !important; +/* icon 설정 */ +.fa:before { + width: 16px; + display: inline-block; + height: 16px; + text-align: center; + vertical-align: middle; } -.cell-content { - background: rgba(51,51,51,0.8) !important; - color: #FFF !important; - font-size: 12px; - line-height: 15px !important; /* 행간 설정 */ -} +/**/ .jexcel_toolbar i.jexcel_toolbar_item { line-height: 16px !important; } @@ -87,6 +117,7 @@ .jexcel thead { background-color: transparent !important; } + /* 행 헤더 스타일 */ .jexcel thead tr td, table.jexcel thead tr td{ @@ -114,13 +145,14 @@ border-right: 1px solid #d9d9d94d !important; border-bottom: 1px solid #d9d9d94d !important; } - .jexcel thead tr td.selected, table.jexcel thead tr td.selected { + /*background-color: #333333 !important;*/ background-color: rgba(51,51,51,0.7) !important; } .jexcel tbody tr.selected td.jexcel_row, table.jexcel tbody tr.selected td.jexcel_row { + /*background-color: #333333 !important;*/ background-color: rgba(51,51,51,0.7) !important; } @@ -166,14 +198,21 @@ } /* custom_icon setting*/ +.fa:before { + width: 16px; + display: inline-block; + height: 16px; + text-align: center; + vertical-align: middle; +} + #modal_excel .fa:before { width: 16px; display: inline-block; height: 16px; text-align: center; vertical-align: middle; line-height: 16px; - color: #FFF; } .fa.fa-font.fa-background { Index: controltower/js/common/jspreadsheet/spreadsheet.js =================================================================== diff -u -r8e78b992bd0ad027f9360928dd57e5d8bafa4791 -r819e8122b947b824c934ca8cfe23a674ece09424 --- controltower/js/common/jspreadsheet/spreadsheet.js (.../spreadsheet.js) (revision 8e78b992bd0ad027f9360928dd57e5d8bafa4791) +++ controltower/js/common/jspreadsheet/spreadsheet.js (.../spreadsheet.js) (revision 819e8122b947b824c934ca8cfe23a674ece09424) @@ -7,8 +7,7 @@ $.getStylesheet("../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jsuites.css"), $.getStylesheet("../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.css"), $.getStylesheet("../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.theme.css"), - $.getStylesheet("./css/jspreadsheet/custom_sheet.css"), - $.getStylesheet("./css/jspreadsheet/custom_icon.css") + $.getStylesheet("./css/jspreadsheet/custom_sheet.css") ).done(function () { //$("#hsh").show(); 에서 $.fn.show(); 와 동일하다. Index: controltower/js/languageConfig.js =================================================================== diff -u -r8e78b992bd0ad027f9360928dd57e5d8bafa4791 -r819e8122b947b824c934ca8cfe23a674ece09424 --- controltower/js/languageConfig.js (.../languageConfig.js) (revision 8e78b992bd0ad027f9360928dd57e5d8bafa4791) +++ controltower/js/languageConfig.js (.../languageConfig.js) (revision 819e8122b947b824c934ca8cfe23a674ece09424) @@ -50,7 +50,6 @@ "../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.datatables.css", "../reference/jquery-plugins/jspreadsheet-ce-4.13.1/dist/jspreadsheet.theme.css", "./js/common/jspreadsheet/spreadsheet.js", - "./css/jspreadsheet/custom_icon.css", "./css/jspreadsheet/custom_sheet.css" ],