Skip to content

Commit

Permalink
Merge branch 'main' into patch-4
Browse files Browse the repository at this point in the history
  • Loading branch information
garbas authored Jun 11, 2024
2 parents e7fca16 + c4b2a85 commit 2eca4c5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions frontend/config/webpack.common.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const HtmlWebpackPlugin = require('html-webpack-plugin');
const {CleanWebpackPlugin} = require('clean-webpack-plugin');


module.exports = (withDebug) => {
module.exports = (withDebug, optimize) => {
return {
entry: './src/index.js',
output: {
Expand Down Expand Up @@ -45,7 +45,7 @@ module.exports = (withDebug) => {
options: {
// add Elm's debug overlay to output
debug: withDebug,
optimize: false
optimize: optimize,
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion frontend/config/webpack.dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ const dev = {

module.exports = env => {
const withDebug = !env.nodebug;
return merge(common(withDebug), dev);
return merge(common(withDebug, false), dev);
}
2 changes: 1 addition & 1 deletion frontend/config/webpack.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ const prod = {

};

module.exports = merge(common(false), prod);
module.exports = merge(common(false, true), prod);
2 changes: 1 addition & 1 deletion frontend/src/Search.elm
Original file line number Diff line number Diff line change
Expand Up @@ -1078,7 +1078,7 @@ viewResults nixosChannels model result viewSuccess _ outMsg categoryName =
Just commit ->
[
text "Data from nixpkgs "
, a [ href ("https://github.com/NixOS/nixpkgs/commit/" ++ commit) ]
, a [ href ("https://github.com/NixOS/nixpkgs/tree/" ++ commit) ]
[ (code [] [ text (String.slice 0 8 commit) ]) ]
, text "."
]
Expand Down
6 changes: 3 additions & 3 deletions frontend/src/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -471,14 +471,14 @@ header .navbar.navbar-static-top {
&:before {
content: "\2315";
display: inline-block;
font-size: 1.5em;
font-size: 2em;
margin-right: 0.2em;
-moz-transform: scale(-1, 1);
-webkit-transform: scale(-1, 1);
-o-transform: scale(-1, 1);
-ms-transform: scale(-1, 1);
transform: scale(-1, 1);
vertical-align: text-bottom;
transform: translateY(0.15em) scaleX(-1);
font-family: monospace;
}
}

Expand Down

0 comments on commit 2eca4c5

Please sign in to comment.